Changeset 36

Timestamp:

11/23/08 19:59:51 (3 years ago)

Author:

tsuckowhomberg

google:author:

tsuckowhomberg

Message:

• enhancement: added build tools for creating minified deployable versions of Ext.ux.Livegrid-scripts
• enhancement: (GridView?.js) the rowIndex argument of the column's renderer will now pass the value of the index of the row as available in the view, i.e. as defined in the row's rowIndex property, which adds support for Ext.grid.RowNumberer?
• fixed: (GridView?.js) fixed a bug where "getPredictedBufferIndex()" would not compute the next rowIndex for a request properly, leading to an endless loop
• enhancement: (GridView?.js, RowSelectionModel?.js) removed override of "onRefresh()" to keep selections after a refresh or sort occured, if, and only if those records are

returned by the response; removed custom call to selection model's "clearSelections()" in the GridView?'s "reset()" method

• enhancement: intercepted "autoLoad" property of Ext.ux.grid.livegrid.Store to make sure the store gets only loaded if the view has been rendered, if the store's autoLoad property was set to "true"

Location:

trunk

Files:

• build (added)
• build-tools (added)
• build-tools/README (added)
• build-tools/unix (added)
• build-tools/unix/make.sh (added)
• build-tools/windows (added)
• build-tools/windows/make.bat (added)
• build/livegrid-all.js (added)
• build/livegrid-core.js (added)
• build/livegrid-debug-all.js.js (added)
• build/resources (added)
• build/resources/css (added)
• build/resources/css/ext-ux-livegrid.css (added)
• build/resources/images (added)
• build/resources/images/loading.gif (added)
• CHANGELOG (modified) (1 diff)
• README (modified) (2 diffs)
• src/EditorGridPanel.js (modified) (1 diff)
• src/GridPanel.js (modified) (1 diff)
• src/GridView.js (modified) (8 diffs)
• src/RowSelectionModel.js (modified) (1 diff)
• src/Store.js (modified) (1 diff)

trunk/CHANGELOG

@@ -1 @@
-Version 0.3a4 (GPL)
+Version 0.3RC1 (GPL)
+23-November-2008
+
+ - enhancement: added build tools for creating minified deployable versions of
+Ext.ux.Livegrid-scripts
+ - enhancement: (GridView.js) the rowIndex argument of the column's renderer will
+now pass the value of the index of the row as available in the view, i.e. as defined
+in the row's rowIndex property, which adds support for Ext.grid.RowNumberer
+ - fixed: (GridView.js) fixed a bug where "getPredictedBufferIndex()" would not
+compute the next rowIndex for a request properly, leading to an endless loop
+ - enhancement: (GridView.js, RowSelectionModel.js) removed override of "onRefresh()"
+to keep selections after a refresh or sort occured, if, and only if those records are
+returned by the response; removed custom call to selection model's "clearSelections()"
+in the GridView's "reset()" method
+ - enhancement: intercepted "autoLoad" property of Ext.ux.grid.livegrid.Store to make
+sure the store gets only loaded if the view has been rendered, if the store's autoLoad
+property was set to "true"
+
+
+Version 0.3a4 (GPL)
 1-November-2008
 

trunk/README

@@ +1 @@
+Note:
+-----
+Including the file "ext-ux-livegrid.css" is mandatory, otherwise the view will
+not be rendered properly.
+
 Author:
 -------
@@ -6 +11 @@
 -------------
 http://www.siteartwork.de/livegrid
-
-History:
---------
-Ext.ux.Livegrid is a subproject of ongoo. Visit <http://www.ongoo.org> for
-more informations.

trunk/src/EditorGridPanel.js

@@ -71 +71 @@
     },
 
-    /**
-     * Since we do not have multiple inheritance, we need to override the
-     * same methods in this class we have overriden for
-     * Ext.ux.grid.livegrid.GridPanel
-     *
-     */
+// Since we do not have multiple inheritance, we need to override the
+// same methods in this class we have overriden for
+// Ext.ux.grid.livegrid.GridPanel
     walkCells : function(row, col, step, fn, scope)
     {
         return Ext.ux.grid.livegrid.GridPanel.prototype.walkCells.call(this, row, col, step, fn, scope);
+    },
+
+    onRender : function(ct, position)
+    {
+        return Ext.ux.grid.livegrid.GridPanel.prototype.onRender.call(this, ct, position);
     }
 

trunk/src/GridPanel.js

@@ -37 +37 @@
 
     /**
+     * Overriden to make sure the attached store loads only when the
+     * grid has been fully rendered if, and only if the store's
+     * "autoLoad" property is set to true.
+     *
+     */
+    onRender : function(ct, position)
+    {
+        Ext.ux.grid.livegrid.GridPanel.superclass.onRender.call(this, ct, position);
+
+        var ds = this.getStore();
+
+        if (ds._autoLoad === true) {
+            delete ds._autoLoad;
+            ds.load();
+        }
+    },
+
+    /**
      * Overriden since the original implementation checks for
      * getCount() of the store, not getTotalCount().

trunk/src/GridView.js

@@ -137 +137 @@
     );
 
-    Ext.ux.grid.livegrid.GridView.superclass.constructor.call(this);
+    // shorthands for often used parent classes
+    this._gridViewSuperclass = Ext.ux.grid.livegrid.GridView.superclass;
+
+    this._gridViewSuperclass.constructor.call(this);
+
+
 };
 
@@ -276 +281 @@
         if (forceReload === false) {
             this.ds.modified = [];
-            this.grid.selModel.clearSelections(true);
+            //this.grid.selModel.clearSelections(true);
             this.rowIndex      = 0;
             this.lastScrollPos = 0;
@@ -325 +330 @@
         g.enableDrag     = false;
 
-        Ext.ux.grid.livegrid.GridView.superclass.renderUI.call(this);
+        this._gridViewSuperclass.renderUI.call(this);
 
         var g = this.grid;
@@ -360 +365 @@
     init: function(grid)
     {
-        Ext.ux.grid.livegrid.GridView.superclass.init.call(this, grid);
+        this._gridViewSuperclass.init.call(this, grid);
 
         grid.on('expand', this._onExpand, this);
@@ -376 +381 @@
         }
 
-        Ext.ux.grid.livegrid.GridView.superclass.initData.call(this, ds, cm);
+        this._gridViewSuperclass.initData.call(this, ds, cm);
     },
 
@@ -389 +394 @@
         var markup = this.renderRows(0, this.visibleRows-1);
         return this.templates.body.apply({rows: markup});
+    },
+
+    /**
+     * Overriden so the renderer of the specific cells gets the index of the
+     * row as available in the view passed (row's rowIndex property)-
+     *
+     */
+    doRender : function(cs, rs, ds, startRow, colCount, stripe)
+    {
+        return this._gridViewSuperclass.doRender.call(
+            this, cs, rs, ds, startRow + this.ds.bufferRange[0], colCount, stripe
+        );
+
     },
 
@@ -1272 +1290 @@
     {
         var lastRowIndex = Math.min(this.ds.totalLength-1,
-                                    rowIndex + this.visibleRows);
+                                    rowIndex + (this.visibleRows-1));
 
         return (rowIndex     >= this.ds.bufferRange[0]) &&
@@ -1288 +1306 @@
     {
         if (!inRange) {
-            var dNear = 2*this.nearLimit;
-            return Math.max(0, index-((dNear >= this.ds.bufferSize ? this.nearLimit : dNear)));
+            if (index + this.ds.bufferSize >= this.ds.totalLength) {
+                return this.ds.totalLength - this.ds.bufferSize;
+            }
+            // we need at last to render the index + the visible Rows
+            return Math.max(0, (index + this.visibleRows) - Math.round(this.ds.bufferSize/2));
         }
         if (!down) {

trunk/src/RowSelectionModel.js

@@ -66 +66 @@
         this.grid.store.on('selectionsload', this.onSelectionsLoad, this);
     },
-
-
-
-    // private
-    onRefresh : function()
-    {
-        this.clearSelections(true);
-    },
-
-
 
     /**

trunk/src/Store.js

@@ -98 +98 @@
     // remoteSort will always be set to true.
     config.remoteSort = true;
+
+    // we will intercept the autoLoad property and set it to false so we do not
+    // load any contents of the store before the View has not fully initialized
+    // itself. if autoLoad was set to true, the Ext.ux.grid.livegrid.GridPanel
+    // will take care of loading the store once it has been rendered
+    this._autoLoad  = config.autoLoad ? true : false;
+    config.autoLoad = false;
 
     this.addEvents(