Changeset 13896

Timestamp:

06/04/08 15:23:27 (7 months ago)

Author:

BryanForbes

Message:

fixes #6892 !strict

• Fixed multiple queries going out for each render.
  

Files:

• dojox/trunk/grid/DataGrid.js (modified) (6 diffs)

dojox/trunk/grid/DataGrid.js

@@ -15 +15 @@
         _cache: null,
         _pages: null,
+        _pending_requests: null,
         _bop: -1,
         _eop: -1,
@@ -26 +27 @@
                 this._rows = [];
                 this._cache = [];
+                this._pending_requests = {};
 
                 this._setStore(this.store);
@@ -116 +118 @@
 
         _onFetchComplete: function(items, req){
-                if(!items || items.length == 0){ return; }
-                //console.log(items);
-                dojo.forEach(items, function(item, idx){
-                        this._addItem(item, req.start+idx);
-                }, this);
-                if(req.isRender){
-                        this.setScrollTop(0);
-                        this.postrender();
-                }
+                if(items && items.length > 0){
+                        //console.log(items);
+                        dojo.forEach(items, function(item, idx){
+                                this._addItem(item, req.start+idx);
+                        }, this);
+                        if(req.isRender){
+                                this.setScrollTop(0);
+                                this.postrender();
+                        }
+                }
+                this._pending_requests[req.start] = false;
         },
 
@@ -136 +140 @@
 
         _fetch: function(start, isRender){
-                if(this.store){
-                        var start = start || 0;
+                var start = start || 0;
+                if(this.store && !this._pending_requests[start]){
+                        this._pending_requests[start] = true;
                         //console.log("fetch: ", start);
                         this.store.fetch({
@@ -209 +214 @@
 
         // paging
-        _requestsPending: function(inBoolean){
+        _requestsPending: function(inRowIndex){
+                return this._pending_requests[inRowIndex];
         },
 
@@ -241 +247 @@
                 if(count > 0){
                         this._requests++;
-                        this._requestsPending(true);
-                        setTimeout(dojo.hitch(this, "_fetch", row, false), 1);
-                        //this.requestRows(row, count);
+                        if(!this._requestsPending(row)){
+                                setTimeout(dojo.hitch(this, "_fetch", row, false), 1);
+                                //this.requestRows(row, count);
+                        }
                 }
         },