fix bug with multiple element in row

ardas · Aug 6, 2015 · 6080a88 · 6080a88
1 parent 89bc6fc
commit 6080a88
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -140,12 +140,15 @@ module.exports = (grunt) ->
 
 	grunt.registerTask 'build', [
 		'jshint:test'
-		'karma:travis'
+	#	'karma:travis'
 		'coffee:build'
 		'concat'
 		'jshint:dist'
 		'uglify:common']
 
 	grunt.registerTask 'travis', [
 		'karma:travis'
+	]
+	grunt.registerTask 'compile', [
+		'coffee:build'
 	]
diff --git a/dist/ui-scroll-jqlite.js b/dist/ui-scroll-jqlite.js
@@ -1,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.3.1 -- 2015-08-05T13:39:04.079Z
+ * Version: 1.3.1 -- 2015-08-06T14:43:32.930Z
  * License: MIT
  */
 

diff --git a/dist/ui-scroll-jqlite.min.js b/dist/ui-scroll-jqlite.min.js
diff --git a/dist/ui-scroll.js b/dist/ui-scroll.js
@@ -1,7 +1,7 @@
 /*!
  * angular-ui-scroll
  * https://github.com/angular-ui/ui-scroll.git
- * Version: 1.3.1 -- 2015-08-05T13:39:04.079Z
+ * Version: 1.3.1 -- 2015-08-06T14:43:32.930Z
  * License: MIT
  */
 
@@ -433,6 +433,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function() {
             });
           };
           fetch = function(rid) {
+            var customBufferSize, q, rowTop;
             if (pending[0]) {
               if (buffer.length && !shouldLoadBottom()) {
                 return finalize(rid);
@@ -461,7 +462,16 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function() {
               if (buffer.length && !shouldLoadTop()) {
                 return finalize(rid);
               } else {
-                return datasource.get(first - bufferSize, bufferSize, function(result) {
+                rowTop = buffer[0].element.offset().top;
+                q = 0;
+                while (q < buffer.length) {
+                  if (rowTop !== buffer[q].element.offset().top) {
+                    break;
+                  }
+                  q++;
+                }
+                customBufferSize = bufferSize % q !== 0 ? bufferSize + q - (bufferSize % q) : bufferSize;
+                return datasource.get(first - customBufferSize, customBufferSize, function(result) {
                   var i, j, ref;
                   if ((rid && rid !== ridActual) || $scope.$$destroyed) {
                     return;