Changeset 3

Timestamp:

05/30/08 03:19:06 (4 years ago)

Author:

tsuckowhomberg

Message:

• fixed: wrong calculation in BufferedGridView?.onLiveScroll (based on lastScrollPosition and actual scrollPosition) caused the view sometimes to not re-render some rows
• fixed: provided bug fix for "ensureVisible: returned x-coordinate does not take the x-position of the gridpanel into account" (see  http://extjs.com/forum/showthread.php?p=175331#post175331)
• enhancement: added cfg option "scrollDelay" in BufferedGridView? for buffering calls to onLiveScroll when scroll-event gets fired (thanks to Rich Waters)

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/BufferedGridView.js (modified) (8 diffs)

trunk/CHANGELOG

@@ -1 @@
-2008-05-28
+2008-05-29
+==========
+- fixed: wrong calculation in BufferedGridView.onLiveScroll (based on lastScrollPosition and actual 
+scrollPosition) caused the view sometimes to not re-render some rows
+- fixed: provided bug fix for "ensureVisible: returned x-coordinate does not take the x-position
+of the gridpanel into account" (see http://extjs.com/forum/showthread.php?p=175331#post175331)
+- enhancement: added cfg option "scrollDelay" in BufferedGridView for buffering calls to onLiveScroll 
+when scroll-event gets fired (thanks to Rich Waters)
+
+
+2008-05-28
 ==========
 - fixed: wrong calculation of last displayable row after removing a row caused selection-model

trunk/src/BufferedGridView.js

@@ -20 +20 @@
 Ext.ux.grid.BufferedGridView = function(config) {
     
-        this.addEvents({
-            /**
-             * @event beforebuffer
-             * Fires when the store is about to buffer new data.
-             * @param {Ext.ux.BufferedGridView} this
-             * @param {Ext.data.Store} store The store
-             * @param {Number} rowIndex
-             * @param {Number} visibleRows
-             * @param {Number} totalCount
-             */
-            'beforebuffer' : true,
-            /**
-             * @event buffer
-             * Fires when the store is finsihed buffering new data.
-             * @param {Ext.ux.BufferedGridView} this
-             * @param {Ext.data.Store} store The store
-             * @param {Number} rowIndex
-             * @param {Number} visibleRows
-             * @param {Number} totalCount
-             */
-            'buffer' : true,
-            /**
-             * @event cursormove
-             * Fires when the the user scrolls through the data.
-             * @param {Ext.ux.BufferedGridView} this
-             * @param {Number} rowIndex The index of the first visible row in the
-             *                          grid absolute to it's position in the model.
-             * @param {Number} visibleRows The number of rows visible in the grid.
-             * @param {Number} totalCount             
-             */
-            'cursormove' : true
-            
-        });   
+    this.addEvents({
+        /**
+         * @event beforebuffer
+         * Fires when the store is about to buffer new data.
+         * @param {Ext.ux.BufferedGridView} this
+         * @param {Ext.data.Store} store The store
+         * @param {Number} rowIndex
+         * @param {Number} visibleRows
+         * @param {Number} totalCount
+         */
+        'beforebuffer' : true,
+        /**
+         * @event buffer
+         * Fires when the store is finsihed buffering new data.
+         * @param {Ext.ux.BufferedGridView} this
+         * @param {Ext.data.Store} store The store
+         * @param {Number} rowIndex
+         * @param {Number} visibleRows
+         * @param {Number} totalCount
+         */
+        'buffer' : true,
+        /**
+         * @event cursormove
+         * Fires when the the user scrolls through the data.
+         * @param {Ext.ux.BufferedGridView} this
+         * @param {Number} rowIndex The index of the first visible row in the
+         *                          grid absolute to it's position in the model.
+         * @param {Number} visibleRows The number of rows visible in the grid.
+         * @param {Number} totalCount             
+         */
+        'cursormove' : true
+        
+    });   
+    
+    /**
+     * @cfg {Number} scrollDelay The number of microseconds a call to the 
+     * onLiveScroll-lisener should be delayed when the scroll event fires
+     */
     
     /**
@@ -347 +352 @@
         this.liveScroller       = new E(cs[0]);
         this.liveScrollerInset  = this.liveScroller.dom.firstChild;
-        this.liveScroller.on('scroll', this.onLiveScroll,  this);
+        this.liveScroller.on('scroll', this.onLiveScroll,  this, {buffer : this.scrollDelay});
         
             this.mainHd = new E(this.mainWrap.dom.firstChild);
@@ -934 +939 @@
     {
         var scrollTop     = this.liveScroller.dom.scrollTop; 
-        var pixelsSkipped = scrollTop-this.lastScrollPos;
-        
-        var rowsSkipped = Math.floor(pixelsSkipped/this.rowHeight);
-        
-        // happens when no scrolling actually happened
-        if (pixelsSkipped == 0) {
-            return;
-        }
         
         var cursor = Math.floor((scrollTop)/this.rowHeight);
         this.rowIndex = cursor;
-        // the lastRowIndex will be set when refreshing the view finished
+        // the lastRowIndex will be set when refreshing the view has finished
         if (cursor == this.lastRowIndex) {
             return;
         }
         
-        this.updateLiveRows(cursor, rowsSkipped);
-        
+        this.updateLiveRows(cursor);
         this.lastScrollPos = this.liveScroller.dom.scrollTop; 
     },    
@@ -1093 +1089 @@
         if (!xy) {
                 return;
-                                }
-        this.focusEl.setXY(xy);
+                }
+                this.focusEl.setXY(xy);
+        
         if(Ext.isGecko){
             this.focusEl.focus();
@@ -1115 +1112 @@
             row = row.rowIndex;
         }
+        
         if(row < 0 || row >= this.ds.totalLength){
             return;
@@ -1124 +1122 @@
         if (row >= this.rowIndex+this.visibleRows) {
             this.adjustScrollerPos(((row-(this.rowIndex+this.visibleRows))+1)*this.rowHeight);
-        } else if (row < this.rowIndex) {
+        } else if (row <= this.rowIndex) {
             this.adjustScrollerPos((rowInd)*this.rowHeight);
         } 
         var rowInd = rowInd < 0 ? row : rowInd;
         var rowEl = this.getRow(rowInd), cellEl;
+        
         if(!(hscroll === false && col === 0)){
             while(this.cm.isHidden(col)){
@@ -1140 +1139 @@
         
         var c = this.scroller.dom;
-
-                return cellEl ? Ext.fly(cellEl).getXY() : [c.scrollLeft, Ext.fly(rowEl).getY()];
+        
+        return cellEl ? 
+            Ext.fly(cellEl).getXY() : 
+            [c.scrollLeft+this.el.getX(), Ext.fly(rowEl).getY()];
     },   
 
@@ -1504 +1505 @@
             liveScroller.un('scroll', this.onLiveScroll, this);
         }
-        this.lastScrollPos    = scrollDom.scrollTop; 
+        this.lastScrollPos   = scrollDom.scrollTop; 
         scrollDom.scrollTop += pixels;
         
         if (suspendEvent === true) {
             scrollDom.scrollTop = scrollDom.scrollTop;
-            liveScroller.on('scroll', this.onLiveScroll, this);
+            liveScroller.on('scroll', this.onLiveScroll, this, {buffer : this.scrollDelay});
         }