Merge pull request peachananr#76 from faygrin/faygrin_fix

Fix error & refactor
val8897 · Jan 26, 2014 · 227cecc · 227cecc
2 parents 3128d9e + 0ac1f28
commit 227cecc
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/jquery.onepage-scroll.js b/jquery.onepage-scroll.js
@@ -137,7 +137,7 @@
         var href = window.location.href.substr(0,window.location.href.indexOf('#')) + "#" + (index + 1);
         history.pushState( {}, document.title, href );
       }   
-      el.transformPage(settings, pos, index);
+      el.transformPage(settings, pos, next.data("index"));
     }
 
     $.fn.moveUp = function() {
@@ -171,7 +171,7 @@
         var href = window.location.href.substr(0,window.location.href.indexOf('#')) + "#" + (index - 1);
         history.pushState( {}, document.title, href );
       }
-      el.transformPage(settings, pos, index);
+      el.transformPage(settings, pos, next.data("index"));
     }
 
     $.fn.moveTo = function(page_index) {
@@ -299,21 +299,7 @@
     if(settings.pagination == true)  {
       $(".onepage-pagination li a").click(function (){
         var page_index = $(this).data("index");
-        if (!$(this).hasClass("active")) {
-          current = $(settings.sectionContainer + ".active")
-          next = $(settings.sectionContainer + "[data-index='" + (page_index) + "']");
-          if(next) {
-            current.removeClass("active")
-            next.addClass("active")
-            $(".onepage-pagination li a" + ".active").removeClass("active");
-            $(".onepage-pagination li a" + "[data-index='" + (page_index) + "']").addClass("active");
-            $("body")[0].className = $("body")[0].className.replace(/\bviewing-page-\d.*?\b/g, '');
-            $("body").addClass("viewing-page-"+next.data("index"))
-          }
-          pos = ((page_index - 1) * 100) * -1;
-          el.transformPage(settings, pos, page_index);
-        }
-        if (settings.updateURL == false) return false;
+        el.moveTo(page_index);
       });
     }