Changeset 10

Timestamp:

08/25/08 03:26:33 (4 years ago)

Author:

tsuckowhomberg

Message:

• fixed: "selectRow()" would allow selecting indexes greater than the "totalLength"-property of the store; added condition to check whether the index is out of bounds (closes google issue 5)

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/BufferedRowSelectionModel.js (modified) (30 diffs)

trunk/CHANGELOG

@@ -1 @@
-Version 0.1.2
+
+- fixes:
+ - BufferedRowSelectionModel: "selectRow()" would allow selecting indexes greater than
+the "totalLength"-property of the store; added condition to check whether the index is
+out of bounds (closes google issue 5)
+
+Version 0.1.2
 25-August-2008
 

trunk/src/BufferedRowSelectionModel.js

@@ -2 +2 @@
  * Ext.ux.grid.BufferedRowSelectionModel V0.1
  * Copyright(c) 2007, http://www.siteartwork.de
- * 
+ *
  * Licensed under the terms of the Open Source LGPL 3.0
  * http://www.gnu.org/licenses/lgpl.html
@@ -12 +12 @@
 
 Ext.ux.grid.BufferedRowSelectionModel = function(config) {
-    
+
 
     this.addEvents({
         /**
-         * The selection dirty event will be triggered in case records were 
-         * inserted/ removed at view indexes that may affect the current 
-         * selection ranges which are only represented by view indexes, but not 
+         * The selection dirty event will be triggered in case records were
+         * inserted/ removed at view indexes that may affect the current
+         * selection ranges which are only represented by view indexes, but not
          * current record-ids
          */
         'selectiondirty' : true
-    });        
-
-        
-    
-    
+    });
+
+
+
+
     Ext.apply(this, config);
-    
+
     this.bufferedSelections = {};
-    
+
     this.pendingSelections = {};
-    
+
     Ext.ux.grid.BufferedRowSelectionModel.superclass.constructor.call(this);
-    
+
 };
 
 Ext.extend(Ext.ux.grid.BufferedRowSelectionModel, Ext.grid.RowSelectionModel, {
-    
-    
+
+
  // private
     initEvents : function()
     {
         Ext.ux.grid.BufferedRowSelectionModel.superclass.initEvents.call(this);
-        
+
         this.grid.store.on('add',            this.onAdd,            this);
         this.grid.store.on('selectionsload', this.onSelectionsLoad, this);
-    },    
-    
-    
-    
+    },
+
+
+
     // private
     onRefresh : function()
@@ -66 +66 @@
             this.fireEvent("selectionchange", this);
         }*/
-    },    
-
-   
-    
+    },
+
+
+
     /**
      * Callback is called when a row gets removed in the view. The process to
@@ -83 +83 @@
      * If r defaults to <tt>null</tt> and index is within the pending selections
      * range, the selectionchange event will be called, too.
-     * Additionally, the method will shift all selections and trigger the 
+     * Additionally, the method will shift all selections and trigger the
      * selectiondirty event if any selections are pending.
      *
@@ -89 +89 @@
     onRemove : function(v, index, r)
     {
-        // if index equals to Number.MIN_VALUE or Number.MAX_VALUE, mark current 
+        // if index equals to Number.MIN_VALUE or Number.MAX_VALUE, mark current
         // pending selections as dirty
         if ((index == Number.MIN_VALUE || index == Number.MAX_VALUE)) {
@@ -95 +95 @@
             this.fireEvent('selectiondirty', this, index, r);
             return;
-        }          
-        
+        }
+
         var viewIndex    = index;
         var fire         = this.bufferedSelections[viewIndex] === true;
         var ranges       = this.getPendingSelections();
         var rangesLength = ranges.length;
-        
-        
+
+
         delete this.bufferedSelections[viewIndex];
-        delete this.pendingSelections[viewIndex]; 
-          
+        delete this.pendingSelections[viewIndex];
+
         if (r) {
             this.selections.remove(r);
-        } 
-               
+        }
+
         if (rangesLength == 0) {
             this.shiftSelections(viewIndex, -1);
-        } else {       
+        } else {
             var s = ranges[0];
             var e = ranges[rangesLength-1];
@@ -119 +119 @@
                     this.shiftSelections(viewIndex, -1);
                 }
-            }       
-        }
-        
+            }
+        }
+
         if (fire) {
-            this.fireEvent('selectionchange', this); 
+            this.fireEvent('selectionchange', this);
         }
     },
@@ -130 +130 @@
     /**
      * If records where added to the store, this method will work as a callback.
-     * The method gets usually called <b>after</b> the onAdd method of the according 
+     * The method gets usually called <b>after</b> the onAdd method of the according
      * view was called.
      * Selections will be shifted down if, and only if, the listeners for the
@@ -140 +140 @@
         var ranges       = this.getPendingSelections();
         var rangesLength = ranges.length;
-        
-        // if index equals to Number.MIN_VALUE or Number.MAX_VALUE, mark current 
+
+        // if index equals to Number.MIN_VALUE or Number.MAX_VALUE, mark current
         // pending selections as dirty
         if ((index == Number.MIN_VALUE || index == Number.MAX_VALUE)) {
-            
+
             // we may shift selections if there are no pendning selections. Everything
             // in the current buffer range will be shifted up!
@@ -150 +150 @@
                 this.shiftSelections(this.grid.getStore().bufferRange[0], records.length);
             }
-        
+
             this.fireEvent('selectiondirty', this, index, records.length);
             return;
-        }        
-        
+        }
+
         if (rangesLength == 0) {
             this.shiftSelections(this.grid.getStore().bufferRange[0]+index, records.length);
@@ -160 +160 @@
         }
 
-        // it is safe to say that the selection is dirty when the inserted index 
-        // is less or equal to the first selection range index or less or equal 
+        // it is safe to say that the selection is dirty when the inserted index
+        // is less or equal to the first selection range index or less or equal
         // to the last selection range index
         var s         = ranges[0];
@@ -172 +172 @@
         }
     },
-    
-  
-    
+
+
+
     /**
      * Shifts current/pending selections. This method can be used when rows where
@@ -186 +186 @@
         var newRequests   = {};
         var totalLength = this.grid.store.totalLength;
-        
+
         this.last = false;
-        
+
         for (var i in this.bufferedSelections) {
             index    = parseInt(i);
@@ -195 +195 @@
                 break;
             }
-            
+
             if (index >= startRow) {
                 newSelections[newIndex] = true;
-                
+
                 if (this.pendingSelections[i]) {
                     newRequests[newIndex] = true;
                 }
-                
+
             } else {
                 newSelections[i] = true;
-                
+
                 if (this.pendingSelections[i]) {
                     newRequests[i] = true;
                 }
             }
-        } 
-        
+        }
+
         this.bufferedSelections  = newSelections;
         this.pendingSelections   = newRequests;
     },
-    
-    /**
-     *
-     * @param {Array} records The records that have been loaded 
+
+    /**
+     *
+     * @param {Array} records The records that have been loaded
      * @param {Array} ranges  An array representing the model index ranges the
      *                        reords have been loaded for.
@@ -225 +225 @@
     {
         this.pendingSelections = {};
-        
+
         this.selections.addAll(records);
-       
-    },    
-    
+
+    },
+
     /**
      * Returns true if there is a next record to select
@@ -238 +238 @@
         return this.last !== false && (this.last+1) < this.grid.store.getTotalCount();
     },
-        
+
     /**
      * Gets the number of selected rows.
@@ -246 +246 @@
     {
         var sels = this.bufferedSelections;
-        
+
         var c = 0;
         for (var i in sels) {
-            c++;    
-        }
-        
+            c++;
+        }
+
         return c;
-    },    
-    
+    },
+
     /**
      * Returns True if the specified row is selected.
@@ -265 +265 @@
             return this.bufferedSelections[index] === true;
         }
-        
+
         var r = index;
         return (r && this.selections.key(r.id) ? true : false);
-    },    
-    
-
-    
+    },
+
+
+
     /**
      * Deselects a row.
@@ -282 +282 @@
             this.last = false;
         }
-        
+
         if(this.lastActive == index){
             this.lastActive = false;
         }
         var r = this.grid.store.getAt(index);
-        
+
         delete this.pendingSelections[index];
         delete this.bufferedSelections[index];
@@ -299 +299 @@
         this.fireEvent("selectionchange", this);
     },
-    
-        
+
+
     /**
      * Selects a row.
@@ -308 +308 @@
     selectRow : function(index, keepExisting, preventViewNotify)
     {
-        // ignore store count, since this is our buffer and the rowIndex may indeed
-        // be greater than the count of records in the store
-        if(this.last === index || this.locked || index < 0) return;// || index >= this.grid.store.getCount())) return;
-        
-        
+        if(this.last === index
+           || this.locked
+           || index < 0
+           || index >= this.grid.store.getTotalCount()) {
+            return;
+        }
+
+
+
         var r = this.grid.store.getAt(index);
-       
+
         if(this.fireEvent("beforerowselect", this, index, keepExisting, r) !== false){
             if(!keepExisting || this.singleSelect){
                 this.clearSelections();
             }
-            
+
             if (r) {
                 this.selections.add(r);
@@ -326 +330 @@
                 this.pendingSelections[index] = true;
             }
-            
-            this.bufferedSelections[index] = true;    
-            
+
+            this.bufferedSelections[index] = true;
+
             this.last = this.lastActive = index;
-            
+
             if(!preventViewNotify){
                 this.grid.getView().onRowSelect(index);
@@ -338 +342 @@
         }
     },
-    
+
     clearPendingSelection : function(index)
     {
-        var r = this.grid.store.getAt(index);   
+        var r = this.grid.store.getAt(index);
         if (!r) {
             return;
         }
         this.selections.add(r);
-        delete this.pendingSelections[index]; 
-    },
-    
+        delete this.pendingSelections[index];
+    },
+
     getPendingSelections : function(asRange)
     {
@@ -355 +359 @@
         var currentRange  = 0;
         var tmpArray      = [];
-        
+
         for (var i in this.pendingSelections) {
             tmpArray.push(parseInt(i));
         }
-        
+
         tmpArray.sort(function(o1,o2){
             if (o1 > o2) {
@@ -369 +373 @@
             }
         });
-        
+
         if (asRange === false) {
             return tmpArray;
         }
-        
+
         var max_i = tmpArray.length;
-        
+
         if (max_i == 0) {
             return [];
         }
-        
+
         ranges[currentRange] = [tmpArray[0], tmpArray[0]];
         for (var i = 0, max_i = max_i-1; i < max_i; i++) {
@@ -389 +393 @@
             }
         }
-        
+
         return ranges;
     },
@@ -406 +410 @@
             }, this);*/
             s.clear();
-            
+
             for (var i in this.bufferedSelections) {
-                this.deselectRow(i);        
-            }
-            
+                this.deselectRow(i);
+            }
+
         }else{
             this.selections.clear();
@@ -418 +422 @@
         this.last = false;
     },
-    
-    
-    /**
-     * Selects a range of rows. All rows in between startRow and endRow are also 
+
+
+    /**
+     * Selects a range of rows. All rows in between startRow and endRow are also
      * selected.
      *
@@ -433 +437 @@
             return;
         }
-        
+
         if(!keepExisting) {
             this.clearSelections();
         }
-        
+
         if (startRow <= endRow) {
             for(var i = startRow; i <= endRow; i++) {
@@ -446 +450 @@
                 this.selectRow(i, true);
             }
-        }  
+        }
     }
-  
+
 });