fixed external link function

zhangciwu · Feb 12, 2012 · cb57fcb · cb57fcb
1 parent ba42fd2
commit cb57fcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/index.html b/index.html
@@ -169,7 +169,12 @@ <h2 class="title">Panel 4</h2>
 
 
 	<hr/>
-	<p>autoHeight: <strong>false</strong>, carousel: <strong>false</strong>, slideDirection: <strong>"vertical"</strong></p>
+	<p>
+		autoHeight: <strong>false</strong>, carousel: <strong>false</strong>, slideDirection: <strong>"vertical"</strong>
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="xtrig" href="#1" rel="magic-slider-3">external Link 1</a> &nbsp;|&nbsp; 
+		<a class="xtrig" href="#3" rel="magic-slider-3">external Link 3</a>
+	</p>
 
 	<div class="magic-slider-wrapper">
 		<div class="magic-slider preload" id="magic-slider-3">

diff --git a/js/magic-slider.js b/js/magic-slider.js
@@ -212,7 +212,7 @@ $.fn.magicSlider = function(settings) {
           // Switch the current tab:
           slider.siblings('.magic-nav').find('a').removeClass('current').parents('ul').find('li:eq(' + (targetPanel - 1) + ') a').addClass('current');
           // Slide
-          $('.panel-container', slider).animate({ marginLeft: offset }, settings.slideEaseDuration, settings.slideEaseFunction);
+          moveToPanel(currentPanel);
           if (!settings.crossLinking) { return false }; // Don't change the URL hash unless cross-linking is specified
         });
       };