Merge pull request #2379 from Servoy/row_inserts_before_current_fix

regression fix for: #2357 scrolling with large amount of columns,columns disappear after sort
angular-ui · Dec 19, 2014 · 82074e8 · 82074e8
2 parents 079f358 + b75df2f
commit 82074e8
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/js/core/factories/GridRenderContainer.js b/src/js/core/factories/GridRenderContainer.js
@@ -335,13 +335,15 @@ angular.module('ui.grid')
 
     var newRange = [];
     if (rowCache.length > self.grid.options.virtualizationThreshold) {
-      // Have we hit the threshold going down?
-      if (self.prevScrollTop < scrollTop && rowIndex < self.prevRowScrollIndex + self.grid.options.scrollThreshold && rowIndex < maxRowIndex) {
-        return;
-      }
-      //Have we hit the threshold going up?
-      if (self.prevScrollTop > scrollTop && rowIndex > self.prevRowScrollIndex - self.grid.options.scrollThreshold && rowIndex < maxRowIndex) {
-        return;
+      if (!(typeof(scrollTop) === 'undefined' || scrollTop === null)) {
+        // Have we hit the threshold going down?
+        if (self.prevScrollTop < scrollTop && rowIndex < self.prevRowScrollIndex + self.grid.options.scrollThreshold && rowIndex < maxRowIndex) {
+          return;
+        }
+        //Have we hit the threshold going up?
+        if (self.prevScrollTop > scrollTop && rowIndex > self.prevRowScrollIndex - self.grid.options.scrollThreshold && rowIndex < maxRowIndex) {
+          return;
+        }
       }
 
       var rangeStart = Math.max(0, rowIndex - self.grid.options.excessRows);