Changeset 57 for branches/Ext3.0/trunk/src/GridView.js

Timestamp:

07/09/09 14:55:22 (3 years ago)

Author:

tsuckow

Message:

• enhancement: added Ext 3.0.0 compatibility
• fixed: (GridView?.js) listener "onBeforeLoad()" now aborts any ongoing server request and properly resets properties "isBuffering" and "isPreBuffering"

Files:

• branches/Ext3.0/trunk/src/GridView.js (modified) (6 diffs)

branches/Ext3.0/trunk/src/GridView.js

@@ -354 +354 @@
                 this.loadMask.msg, this.loadMask.msgCls
             );
-            this._loadMaskAnchor._mask.addClass('ext-ux-livegrid');
-            this._loadMaskAnchor._mask.setDisplayed(false);
-            this._loadMaskAnchor._maskMsg.setDisplayed(false);
+            var dom  = this._loadMaskAnchor.dom;
+            var data = Ext.Element.data;
+            data(dom, 'mask').addClass('ext-ux-livegrid');
+            data(dom, 'mask').setDisplayed(false);
+            data(dom, 'maskMsg').setDisplayed(false);
         }
     },
@@ -489 +491 @@
         var vw = csize.width;
 
-        if(vw < 20 || csize.height < 20){ // display: none?
+        if(!g.hideHeaders && vw < 20 || csize.height < 20){ // display: none?
             return;
         }
@@ -574 +576 @@
         this.updateHeaderSortState();
         this.afterMove(newIndex);
+        this.grid.fireEvent('columnmove', oldIndex, newIndex);
     },
 
@@ -866 +869 @@
     onBeforeLoad : function(store, options)
     {
+        var proxy = store.proxy;
+        if (proxy.activeRequest[Ext.data.Api.actions.read]) {
+            proxy.getConnection().abort(proxy.activeRequest[Ext.data.Api.actions.read]);
+        }
+
+        this.isBuffering    = false;
+        this.isPreBuffering = false;
+
         options.params = options.params || {};
 
@@ -1055 +1066 @@
     processRows : function(startRow, skipStripe, paintSelections)
     {
-        skipStripe = skipStripe || !this.grid.stripeRows;
-        // we will always process all rows in the view
-        startRow = 0;
-        var rows = this.getRows();
-        var cls = ' x-grid3-row-alt ';
+        if(!this.ds || this.ds.getCount() < 1){
+            return;
+        }
+
         var cursor = this.rowIndex;
-
-        var index      = 0;
-        var selections = this.grid.selModel.selections;
-        var ds         = this.ds;
-        var row        = null;
-        for(var i = startRow, len = rows.length; i < len; i++){
-            index = i+cursor;
-            row   = rows[i];
-            // changed!
-            row.rowIndex = index;
+        skipStripe   = skipStripe || !this.grid.stripeRows;
+        var rows     = this.getRows();
+        var index    = 0;
+
+        Ext.each(rows, function(row, idx) {
+            row.rowIndex = index = cursor+idx;
+            row.className = row.className.replace(this.rowClsRe, ' ');
+            if (!skipStripe && (index + 1) % 2 === 0) {
+                row.className += ' x-grid3-row-alt';
+            }
 
             if (paintSelections !== false) {
                 if (this.grid.selModel.isSelected(this.ds.getAt(index)) === true) {
-                    this.addRowClass(index, "x-grid3-row-selected");
+                    this.addRowClass(index, this.selectedRowClass);
                 } else {
-                    this.removeRowClass(index, "x-grid3-row-selected");
+                    this.removeRowClass(index, this.selectedRowClass);
                 }
                 this.fly(row).removeClass("x-grid3-row-over");
             }
-
-            if(!skipStripe){
-                var isAlt = ((index+1) % 2 == 0);
-                var hasAlt = (' '+row.className + ' ').indexOf(cls) != -1;
-                if(isAlt == hasAlt){
-                    continue;
-                }
-                if(isAlt){
-                    row.className += " x-grid3-row-alt";
-                }else{
-                    row.className = row.className.replace("x-grid3-row-alt", "");
-                }
-            }
+        }, this);
+
+        // add first/last-row classes
+        if(cursor === 0){
+            Ext.fly(rows[0]).addClass(this.firstRowCls);
+        } else if (cursor + rows.length == this.ds.totalLength) {
+            Ext.fly(rows[rows.length - 1]).addClass(this.lastRowCls);
         }
     },
@@ -1486 +1490 @@
         }
 
-        var mask    = this._loadMaskAnchor._mask;
-        var maskMsg = this._loadMaskAnchor._maskMsg;
+        var dom  = this._loadMaskAnchor.dom;
+        var data = Ext.Element.data;
+
+        var mask    = data(dom, 'mask');
+        var maskMsg = data(dom, 'maskMsg');
 
         if (show) {