Increment version, repeat scroll until filled, missing brackets

OlduwanSteve · Jun 25, 2014 · 5c067d0 · 5c067d0
1 parent 31aa0cc
commit 5c067d0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/build/ng-infinite-scroll.js b/build/ng-infinite-scroll.js
@@ -1,4 +1,4 @@
-/* ng-infinite-scroll - v1.1.2 - 2014-05-21 */
+/* ng-infinite-scroll - v1.1.2 - 2014-06-25 */
 var mod;
 
 mod = angular.module('infinite-scroll', []);
@@ -41,10 +41,11 @@ mod.directive('infiniteScroll', [
             elementBottom = $(document).height();
           }
           remaining = elementBottom - containerBottom;
-          shouldScroll = remaining <= container.height() * scrollDistance + 1;
+          shouldScroll = remaining <= container.height() * (scrollDistance + 1);
           if (shouldScroll) {
             checkWhenEnabled = true;
             if (scrollEnabled) {
+              $timeout((function() {}, handler()), 0);
               if (scope.$$phase || $rootScope.$$phase) {
                 return scope.infiniteScroll();
               } else {

diff --git a/build/ng-infinite-scroll.min.js b/build/ng-infinite-scroll.min.js
diff --git a/component.json b/component.json
@@ -1,8 +1,8 @@
 {
   "name": "nginfinitescroll",
-  "repo": "sroze/nginfinitescroll",
+  "repo": "olduwansteve/nginfinitescroll",
   "description": "Infinite scrolling for AngularJS",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "keywords": ["scroll", "infinite", "angular", "angularjs"],
   "scripts": ["build/ng-infinite-scroll.min.js"],
   "dependencies":{},

diff --git a/src/infinite-scroll.coffee b/src/infinite-scroll.coffee
@@ -42,12 +42,16 @@ mod.directive 'infiniteScroll', ['$rootScope', '$window', '$timeout', 'THROTTLE_
         elementBottom = $(document).height()
 
       remaining = elementBottom - containerBottom
-      shouldScroll = remaining <= container.height() * scrollDistance + 1
+      shouldScroll = remaining <= container.height() * (scrollDistance + 1)
 
       if shouldScroll
         checkWhenEnabled = true
 
         if scrollEnabled
+          # Always schedule another check to see if the container is full after the call
+          $timeout (->
+          handler()
+          ), 0
           if scope.$$phase || $rootScope.$$phase
             scope.infiniteScroll()
           else