Ticket #5842: 5842.patch

dojox/grid/_grid/publicEvents.js

@@ -150 +150 @@
                 //              Event fired when a cell is clicked.
                 // e: Event
                 //              Decorated event object which contains reference to grid, cell, and rowIndex
+                this._click[0] = this._click[1];
+                this._click[1] = e;
                 if(!this.edit.isEditCell(e.rowIndex, e.cellIndex)){
                         this.focus.setFocusCell(e.cell, e.rowIndex);
                 }
@@ -161 +163 @@
                 //              Event fired when a cell is double-clicked.
                 // e: Event
                 //              Decorated event object contains reference to grid, cell, and rowIndex
-                this.edit.setEditCell(e.cell, e.rowIndex); 
+                if(dojo.isIE){
+                        this.edit.setEditCell(this._click[1].cell, this._click[1].rowIndex);
+                }else if(this._click[0].rowIndex != this._click[1].rowIndex){
+                        this.edit.setEditCell(this._click[0].cell, this._click[0].rowIndex);
+                }else{
+                        this.edit.setEditCell(e.cell, e.rowIndex);
+                }
                 this.onRowDblClick(e);
         },
 

dojox/grid/VirtualGrid.js

@@ -109 +109 @@
         // singleClickEdit: boolean
         //              Single-click starts editing. Default is double-click
         singleClickEdit: false,
+
+        // Used to store the last two clicks, to ensure double-clicking occurs based on the intended row
+        _click: null,
         
         // private
         sortInfo: 0,
@@ -137 +140 @@
                 // replace stock styleChanged with one that triggers an update
                 this.styleChanged = this._styleChanged;
                 this.setStructure(this.structure);
+                this._click = [];
         },
         
         destroy: function(){