Merge branch 'master' of https://github.com/angular-ui/ui-scroll

Author: dhilt

README.md

@@ -53,7 +53,7 @@ If you plan to use ui-scroll over jQuery feel free to skip ui-scroll-jqlite.
 ###Usage
 
 ```html
-<ANY ui-scroll="{scroll_expression}" buffer-size="value" padding="value">
+<ANY ui-scroll="{scroll_expression}" buffer-size="value" padding="value" adapter="name">
       ...
 </ANY>
 ```
@@ -88,7 +88,7 @@ Data source is an object to be used by the uiScroll directive to access the data
 The directive will locate the object using the provided data source name. It will first look for a property with the given name on its $scope.
 If none found it will try to get an angular service with the provided name.
 
-The datasource object implements methods and properties to be used by the directive to access the data:
+The data source object implements methods and properties to be used by the directive to access the data:
 
 * Method `get`
 
@@ -103,7 +103,7 @@ The datasource object implements methods and properties to be used by the direct
     * **descriptor** is an object defining the portion of the dataset requested. The object will have 3 properties. Two of them named  `index` and `count`. They have the same meaning as in the alternative signature when the parameters passed explicitly (see below). The third one will be named either `append` if the items will be appended to the last item in the buffer, or `prepend` if they are to be prepended to the first item in the buffer. The value of the property in either case will be the item the new items will be appended/prepended to. This is useful if it is easier to identify the items to be added based on the previously requested items rather than on the index. Keep in mind that in certain use cases (i.e. on initial load) the value of the append/prepend property can be undefined.
     * **index** indicates the first data row requested
     * **count** indicates number of data rows requested
-    * **success** function to call when the data are retrieved. The implementation of the datsource has to call this function when the data are retrieved and pass it an array of the items retrieved. If no items are retrieved, an empty array has to be passed.
+    * **success** function to call when the data are retrieved. The implementation of the data source has to call this function when the data are retrieved and pass it an array of the items retrieved. If no items are retrieved, an empty array has to be passed.
 
 **Important:** Make sure to respect the `index` and `count` parameters of the request. The array passed to the success method should have
 exactly `count` elements unless it hit eof/bof

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
       };
     }
   ]);

dist/ui-scroll-jqlite.js

@@ -1,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.3.3 -- 2016-03-15T20:00:58.115Z
+ * Version: 1.3.3 -- 2016-03-16T09:12:39.242Z
  * License: MIT
  */
 

dist/ui-scroll-jqlite.min.js

@@ -1,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.3.3 -- 2016-03-15T20:00:58.115Z
+ * Version: 1.3.3 -- 2016-03-16T09:12:39.242Z
  * License: MIT
  */
 
@@ -115,7 +115,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
       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, {
@@ -215,28 +215,9 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
     return buffer;
   }
 
-  function Padding(template) {
-    var result = undefined;
-    var tagName = template.localName;
-
-    switch (tagName) {
-      case 'dl':
-        throw new Error('ui-scroll directive does not support <' + tagName + '> as a repeating tag: ' + template.outerHTML);
-      case 'tr':
-        var table = angular.element('<table><tr><td><div></div></td></tr></table>');
-        result = table.find('tr');
-        break;
-      case 'li':
-        result = angular.element('<li></li>');
-        break;
-      default:
-        result = angular.element('<div></div>');
-    }
-
-    return result;
-  }
-
   function Viewport(buffer, element, controllers, attrs) {
+    var PADDING_MIN = 0.3;
+    var PADDING_DEFAULT = 0.5;
     var topPadding = null;
     var bottomPadding = null;
     var averageItemHeight = 0;
@@ -254,7 +235,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
     };
 
     function bufferPadding() {
-      return viewport.outerHeight() * Math.max(0.1, +attrs.padding || 0.1); // some extra space to initiate preload
+      return viewport.outerHeight() * Math.max(PADDING_MIN, +attrs.padding || PADDING_DEFAULT); // some extra space to initiate preload
     }
 
     angular.extend(viewport, {
@@ -263,6 +244,27 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
         bottomPadding = new Padding(template);
         element.before(topPadding);
         element.after(bottomPadding);
+
+        function Padding(template) {
+          var result = undefined;
+          var tagName = template.localName;
+
+          switch (tagName) {
+            case 'dl':
+              throw new Error('ui-scroll directive does not support <' + tagName + '> as a repeating tag: ' + template.outerHTML);
+            case 'tr':
+              var table = angular.element('<table><tr><td><div></div></td></tr></table>');
+              result = table.find('tr');
+              break;
+            case 'li':
+              result = angular.element('<li></li>');
+              break;
+            default:
+              result = angular.element('<div></div>');
+          }
+
+          return result;
+        }
       },
       bottomDataPos: function bottomDataPos() {
         var scrollHeight = viewport[0].scrollHeight;
@@ -365,6 +367,12 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
           topPadding.height(0);
           viewport.scrollTop(viewport.scrollTop() - paddingHeight);
         }
+      },
+      resetTopPaddingHeight: function resetTopPaddingHeight() {
+        topPadding.height(0);
+      },
+      resetBottomPaddingHeight: function resetBottomPaddingHeight() {
+        bottomPadding.height(0);
       }
     });
 
@@ -582,10 +590,6 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
       viewport.bind('scroll', resizeAndScrollHandler);
       viewport.bind('mousewheel', wheelHandler);
 
-      $scope.$watch(datasource.revision, function () {
-        return reload();
-      });
-
       $scope.$on('$destroy', function () {
         // clear the buffer. It is necessary to remove the elements and $destroy the scopes
         buffer.clear();
@@ -594,6 +598,31 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
         viewport.unbind('mousewheel', wheelHandler);
       });
 
+      // update events (deprecated since v1.1.0, unsupported since 1.2.0)
+      (function () {
+        var eventListener = datasource.scope ? datasource.scope.$new() : $scope.$new();
+
+        eventListener.$on('insert.item', function () {
+          return unsupportedMethod('insert');
+        });
+
+        eventListener.$on('update.items', function () {
+          return unsupportedMethod('update');
+        });
+
+        eventListener.$on('delete.items', function () {
+          return unsupportedMethod('delete');
+        });
+
+        function unsupportedMethod(token) {
+          throw new Error(token + ' event is no longer supported - use applyUpdates instead');
+        }
+      })();
+
+      reload();
+
+      /* Functions definitions */
+
       function dismissPendingRequests() {
         ridActual++;
         pending = [];
@@ -602,6 +631,9 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
       function reload() {
         dismissPendingRequests();
 
+        viewport.resetTopPaddingHeight();
+        viewport.resetBottomPaddingHeight();
+
         if (arguments.length) {
           buffer.clear(arguments[0]);
         } else {
@@ -832,27 +864,6 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
           event.preventDefault();
         }
       }
-
-      // update events (deprecated since v1.1.0, unsupported since 1.2.0)
-      (function () {
-        var eventListener = datasource.scope ? datasource.scope.$new() : $scope.$new();
-
-        eventListener.$on('insert.item', function () {
-          return unsupportedMethod('insert');
-        });
-
-        eventListener.$on('update.items', function () {
-          return unsupportedMethod('update');
-        });
-
-        eventListener.$on('delete.items', function () {
-          return unsupportedMethod('delete');
-        });
-
-        function unsupportedMethod(token) {
-          throw new Error(token + ' event is no longer supported - use applyUpdates instead');
-        }
-      })();
     };
   }
 }]);