Changeset 14906

Timestamp:

08/18/08 23:30:20 (19 months ago)

Author:

toonetown

Message:

Fixes #7472 - prevent the scroller from loading the entire data set when using a number-based autoHeight !strict

Files:

• dojox/trunk/grid/_Grid.js (modified) (2 diffs)

dojox/trunk/grid/_Grid.js

@@ -626 +626 @@
                                 }
                         }
-                        this.scroller.windowHeight = h;
+                        if(this.autoHeight === true || h != -1 || (typeof this.autoHeight == "number" && this.autoHeight >= this.rowCount)){
+                                this.scroller.windowHeight = h;
+                        }else{
+                                this.scroller.windowHeight = Math.max(this.domNode.clientHeight - t, 0);
+                        }
                 },
 
@@ -771 +775 @@
                         }else{
                                 this.rowCount = inRowCount;
+                                this._setAutoHeightAttr(this.autoHeight, true);
                                 if(this.layout.cells.length){
                                         this.scroller.updateRowCount(inRowCount);
+                                }
+                                this._resize();                         
+                                if(this.layout.cells.length){
                                         this.setScrollTop(this.scrollTop);
                                 }
-                                this._setAutoHeightAttr(this.autoHeight, true);
-                                this._resize();
                         }
                 },