Merge pull request #226 from sergiovilar/master

Fixed infinite-scroll-immediate-check behavior
sroze · Jan 14, 2016 · f2fbba2 · f2fbba2
2 parents 03bac29 + 68c505d
commit f2fbba2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/build/ng-infinite-scroll.js b/build/ng-infinite-scroll.js
@@ -1,4 +1,4 @@
-/* ng-infinite-scroll - v1.2.0 - 2015-02-14 */
+/* ng-infinite-scroll - v1.2.0 - 2015-12-02 */
 var mod;
 
 mod = angular.module('infinite-scroll', []);
@@ -17,7 +17,7 @@ mod.directive('infiniteScroll', [
         infiniteScrollListenForEvent: '@'
       },
       link: function(scope, elem, attrs) {
-        var changeContainer, checkWhenEnabled, container, handleInfiniteScrollContainer, handleInfiniteScrollDisabled, handleInfiniteScrollDistance, handleInfiniteScrollUseDocumentBottom, handler, height, immediateCheck, offsetTop, pageYOffset, scrollDistance, scrollEnabled, throttle, unregisterEventListener, useDocumentBottom, windowElement;
+        var changeContainer, checkInterval, checkWhenEnabled, container, handleInfiniteScrollContainer, handleInfiniteScrollDisabled, handleInfiniteScrollDistance, handleInfiniteScrollUseDocumentBottom, handler, height, immediateCheck, offsetTop, pageYOffset, scrollDistance, scrollEnabled, throttle, unregisterEventListener, useDocumentBottom, windowElement;
         windowElement = angular.element($window);
         scrollDistance = null;
         scrollEnabled = null;
@@ -26,6 +26,7 @@ mod.directive('infiniteScroll', [
         immediateCheck = true;
         useDocumentBottom = false;
         unregisterEventListener = null;
+        checkInterval = false;
         height = function(elem) {
           elem = elem[0] || elem;
           if (isNaN(elem.offsetHeight)) {
@@ -76,6 +77,9 @@ mod.directive('infiniteScroll', [
               }
             }
           } else {
+            if (checkInterval) {
+              $interval.cancel(checkInterval);
+            }
             return checkWhenEnabled = false;
           }
         };
@@ -175,11 +179,11 @@ mod.directive('infiniteScroll', [
         if (attrs.infiniteScrollImmediateCheck != null) {
           immediateCheck = scope.$eval(attrs.infiniteScrollImmediateCheck);
         }
-        return $interval((function() {
+        return checkInterval = $interval((function() {
           if (immediateCheck) {
             return handler();
           }
-        }), 0, 1);
+        }), 0);
       }
     };
   }

diff --git a/build/ng-infinite-scroll.min.js b/build/ng-infinite-scroll.min.js
diff --git a/src/infinite-scroll.coffee b/src/infinite-scroll.coffee
@@ -22,6 +22,7 @@ mod.directive 'infiniteScroll', ['$rootScope', '$window', '$interval', 'THROTTLE
     immediateCheck = true
     useDocumentBottom = false
     unregisterEventListener = null
+    checkInterval = false
 
     height = (elem) ->
       elem = elem[0] or elem
@@ -71,6 +72,7 @@ mod.directive 'infiniteScroll', ['$rootScope', '$window', '$interval', 'THROTTLE
           else
             scope.$apply(scope.infiniteScroll)
       else
+        if checkInterval then $interval.cancel checkInterval
         checkWhenEnabled = false
 
     # The optional THROTTLE_MILLISECONDS configuration value specifies
@@ -198,8 +200,8 @@ mod.directive 'infiniteScroll', ['$rootScope', '$window', '$interval', 'THROTTLE
     if attrs.infiniteScrollImmediateCheck?
       immediateCheck = scope.$eval(attrs.infiniteScrollImmediateCheck)
 
-    $interval (->
+    checkInterval = $interval (->
       if immediateCheck
         handler()
-    ), 0, 1
+    ), 0
 ]