Merge pull request #54 from aantipov/call-first-reload-with-timeout

Call first reload with $timeout

Author: mfeingold

demo/examples/positionedList.js

@@ -8,7 +8,7 @@ angular.module('application', [
     '$rootScope',
     '$location',
     function (console, $timeout, $rootScope, $location) {
-      var current, data, get, i, j, k, l, len, len1, letter1, letter2, position, ref, ref1, revision;
+      var current, data, get, i, j, k, l, len, len1, letter1, letter2, position, ref, ref1;
       $rootScope.key = "";
       position = 0;
       data = [];
@@ -50,12 +50,9 @@ angular.module('application', [
         }
         return current++;
       });
-      revision = function () {
-        return current;
-      };
+
       return {
-        get: get,
-        revision: revision
+        get: get
       };
     }
   ]);

src/ui-scroll.js

@@ -99,7 +99,7 @@ angular.module('ui.scroll', [])
           buffer.first = origin;
           buffer.next = origin;
           buffer.minIndex = Number.MAX_VALUE;
-          return buffer.maxIndex = Number.MIN_VALUE;
+          buffer.maxIndex = Number.MIN_VALUE;
         }
 
         angular.extend(buffer, {
@@ -566,8 +566,6 @@ angular.module('ui.scroll', [])
           viewport.bind('scroll', resizeAndScrollHandler);
           viewport.bind('mousewheel', wheelHandler);
 
-          $scope.$watch(datasource.revision, () => reload());
-
           $scope.$on('$destroy', () => {
             // clear the buffer. It is necessary to remove the elements and $destroy the scopes
             buffer.clear();
@@ -576,6 +574,25 @@ angular.module('ui.scroll', [])
             viewport.unbind('mousewheel', wheelHandler);
           });
 
+          // update events (deprecated since v1.1.0, unsupported since 1.2.0)
+          (() => {
+            const eventListener = datasource.scope ? datasource.scope.$new() : $scope.$new();
+
+            eventListener.$on('insert.item', () => unsupportedMethod('insert'));
+
+            eventListener.$on('update.items', () => unsupportedMethod('update'));
+
+            eventListener.$on('delete.items', () => unsupportedMethod('delete'));
+
+            function unsupportedMethod(token) {
+              throw new Error(token + ' event is no longer supported - use applyUpdates instead');
+            }
+          })();
+
+          reload();
+
+          /* Functions definitions */
+
           function dismissPendingRequests() {
             ridActual++;
             pending = [];
@@ -807,21 +824,6 @@ angular.module('ui.scroll', [])
               event.preventDefault();
             }
           }
-
-          // update events (deprecated since v1.1.0, unsupported since 1.2.0)
-          (() => {
-            const eventListener = datasource.scope ? datasource.scope.$new() : $scope.$new();
-
-            eventListener.$on('insert.item', () => unsupportedMethod('insert'));
-
-            eventListener.$on('update.items', () => unsupportedMethod('update'));
-
-            eventListener.$on('delete.items', () => unsupportedMethod('delete'));
-
-            function unsupportedMethod(token) {
-              throw new Error(token + ' event is no longer supported - use applyUpdates instead');
-            }
-          })();
         };
       }
     }