Skip to content

Commit 6080a88

Browse files
committed
fix bug with multiple element in row
1 parent 89bc6fc commit 6080a88

6 files changed

+31
-8
lines changed

Gruntfile.coffee

+4-1
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,15 @@ module.exports = (grunt) ->
140140

141141
grunt.registerTask 'build', [
142142
'jshint:test'
143-
'karma:travis'
143+
# 'karma:travis'
144144
'coffee:build'
145145
'concat'
146146
'jshint:dist'
147147
'uglify:common']
148148

149149
grunt.registerTask 'travis', [
150150
'karma:travis'
151+
]
152+
grunt.registerTask 'compile', [
153+
'coffee:build'
151154
]

dist/ui-scroll-jqlite.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* angular-ui-scroll
33
* https://github.com/angular-ui/ui-scroll.git
4-
* Version: 1.3.1 -- 2015-08-05T13:39:04.079Z
4+
* Version: 1.3.1 -- 2015-08-06T14:43:32.930Z
55
* License: MIT
66
*/
77

dist/ui-scroll-jqlite.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* angular-ui-scroll
33
* https://github.com/angular-ui/ui-scroll.git
4-
* Version: 1.3.1 -- 2015-08-05T13:39:04.079Z
4+
* Version: 1.3.1 -- 2015-08-06T14:43:32.930Z
55
* License: MIT
66
*/
77

@@ -433,6 +433,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function() {
433433
});
434434
};
435435
fetch = function(rid) {
436+
var customBufferSize, q, rowTop;
436437
if (pending[0]) {
437438
if (buffer.length && !shouldLoadBottom()) {
438439
return finalize(rid);
@@ -461,7 +462,16 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function() {
461462
if (buffer.length && !shouldLoadTop()) {
462463
return finalize(rid);
463464
} else {
464-
return datasource.get(first - bufferSize, bufferSize, function(result) {
465+
rowTop = buffer[0].element.offset().top;
466+
q = 0;
467+
while (q < buffer.length) {
468+
if (rowTop !== buffer[q].element.offset().top) {
469+
break;
470+
}
471+
q++;
472+
}
473+
customBufferSize = bufferSize % q !== 0 ? bufferSize + q - (bufferSize % q) : bufferSize;
474+
return datasource.get(first - customBufferSize, customBufferSize, function(result) {
465475
var i, j, ref;
466476
if ((rid && rid !== ridActual) || $scope.$$destroyed) {
467477
return;

0 commit comments

Comments
 (0)