Fix djett41#10

Fix djett41#14 Stop showing header during infinite scroll.
amrael · Oct 30, 2015 · 364fcb3 · 364fcb3
1 parent cc03924
commit 364fcb3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,7 @@
 node_modules
-bower_components
+bower_components
+/.vs/
+/*.jsproj
+/*.jsproj.user
+/*.sln
+/taco.json
diff --git a/dist/ionic.scroll.sista.js b/dist/ionic.scroll.sista.js
@@ -235,20 +235,11 @@
           /**
            * Before the active view leaves, reset elements, and reset the scroll container
            */
-          $scope.$parent.$on('$ionicView.beforeLeave', function () {
-            isNavBarTransitioning = true;
-            translateElementsSync(0);
-            activeHeader = null;
-            cachedHeader = null;
-          });
-
-          /**
-           * Scroll to the top when entering to reset then scrollView scrollTop. (prevents jumping)
-           */
-          $scope.$parent.$on('$ionicView.beforeEnter', function () {
-            if (scrollView) {
-              scrollView.scrollTo(0, 0);
-            }
+          $scope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
+              isNavBarTransitioning = true;
+              translateElementsSync(0, 0);
+              activeHeader = null;
+              cachedHeader = null;
           });
 
           /**
@@ -271,20 +262,14 @@
             if (isNavBarTransitioning) {
               return;
             }
-            //support for jQuery event as well
+            //support for jQuery events
             e = e.originalEvent || e;
 
             var duration = 0;
             var scrollTop = e.detail.scrollTop;
 
             y = scrollTop >= 0 ? Math.min(defaultEnd, Math.max(0, y + scrollTop - prevScrollTop)) : 0;
 
-            //if we are at the bottom, animate the header/tabs back in
-            if (scrollView.getScrollMax().top - scrollTop <= contentTop) {
-              y = 0;
-              duration = defaultDuration;
-            }
-
             prevScrollTop = scrollTop;
 
             //if previous and current y are the same, no need to continue

diff --git a/dist/ionic.scroll.sista.min.js b/dist/ionic.scroll.sista.min.js
diff --git a/js/ionic.scroll.sista.js b/js/ionic.scroll.sista.js
@@ -235,20 +235,11 @@
           /**
            * Before the active view leaves, reset elements, and reset the scroll container
            */
-          $scope.$parent.$on('$ionicView.beforeLeave', function () {
-            isNavBarTransitioning = true;
-            translateElementsSync(0);
-            activeHeader = null;
-            cachedHeader = null;
-          });
-
-          /**
-           * Scroll to the top when entering to reset then scrollView scrollTop. (prevents jumping)
-           */
-          $scope.$parent.$on('$ionicView.beforeEnter', function () {
-            if (scrollView) {
-              scrollView.scrollTo(0, 0);
-            }
+          $scope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
+              isNavBarTransitioning = true;
+              translateElementsSync(0, 0);
+              activeHeader = null;
+              cachedHeader = null;
           });
 
           /**
@@ -279,12 +270,6 @@
 
             y = scrollTop >= 0 ? Math.min(defaultEnd, Math.max(0, y + scrollTop - prevScrollTop)) : 0;
 
-            //if we are at the bottom, animate the header/tabs back in
-            if (scrollView.getScrollMax().top - scrollTop <= contentTop) {
-              y = 0;
-              duration = defaultDuration;
-            }
-
             prevScrollTop = scrollTop;
 
             //if previous and current y are the same, no need to continue