Changeset 14868

Timestamp:

08/15/08 19:31:23 (5 months ago)

Author:

toonetown

Message:

Fixes #7273 Fixes #7186 - restore scroll position when sorting or resizing columns !strict

Location:

dojox/trunk/grid

Files:

• DataGrid.js (modified) (3 diffs)
• _Grid.js (modified) (3 diffs)
• _Scroller.js (modified) (1 diff)

dojox/trunk/grid/DataGrid.js

@@ -155 +155 @@
                                 this.setScrollTop(0);
                                 this.postrender();
-                        }
-                }
+                        }else if(this._lastScrollTop){
+                                this.setScrollTop(this._lastScrollTop);
+                        }
+                }
+                delete this._lastScrollTop;
                 if(!this._isLoaded){
                         this._isLoading = false;
@@ -171 +174 @@
         _onFetchError: function(err, req){
                 console.log(err);
+                delete this._lastScrollTop;
                 if(!this._isLoaded){
                         this._isLoading = false;
@@ -355 +359 @@
 
         sort: function(){
+                this._lastScrollTop = this.scrollTop;
                 this._refresh();
         },

dojox/trunk/grid/_Grid.js

@@ -338 +338 @@
                         // summary: Creates a new virtual scroller
                         this.scroller = new dojox.grid._Scroller();
+                        this.scroller.grid = this;
                         this.scroller._pageIdPrefix = this.id + '-';
                         this.scroller.renderRow = dojo.hitch(this, "renderRow");
@@ -728 +729 @@
                         }
                         //this.edit.saveState(inRowIndex);
+                        var lastScrollTop = this.scrollTop;
                         this.prerender();
                         this.scroller.invalidateNodes();
-                        this.setScrollTop(this.scrollTop);
+                        this.setScrollTop(lastScrollTop);
                         this.postrender();
                         //this.edit.restoreState(inRowIndex);
@@ -829 +831 @@
 
                 setScrollTop: function(inTop){
-                        this.scrollTop = this.views.setScrollTop(inTop);
-                        this.scroller.scroll(this.scrollTop);
+                        this.scroller.scroll(this.views.setScrollTop(inTop));
                 },
 

dojox/trunk/grid/_Scroller.js

@@ -336 +336 @@
                 },
                 scroll: function(inTop){
+                        this.grid.scrollTop = inTop;
                         if(this.colCount){
                                 this.startPacify();