Upgrade to ExtJS 3.2.1 - Released 04/27/2010

[extjs.git] / src / widgets / grid / EditorGrid.js

diff --git a/src/widgets/grid/EditorGrid.js b/src/widgets/grid/EditorGrid.js
index 294aac1..78c0298 100644 (file)
--- a/src/widgets/grid/EditorGrid.js
+++ b/src/widgets/grid/EditorGrid.js
@@ -1,6 +1,6 @@
 /*!
 /*!

- * Ext JS Library 3.0.3
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.2.1
+ * Copyright(c) 2006-2010 Ext JS, Inc.

  * licensing@extjs.com
  * http://www.extjs.com/license
  */
  * licensing@extjs.com
  * http://www.extjs.com/license
  */


@@ -35,7 +35,7 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
      * editing that cell.</p>
      */
     clicksToEdit: 2,
      * editing that cell.</p>
      */
     clicksToEdit: 2,

-    
+

     /**
     * @cfg {Boolean} forceValidation
     * True to force validation even if the value is unmodified (defaults to false)
     /**
     * @cfg {Boolean} forceValidation
     * True to force validation even if the value is unmodified (defaults to false)


@@ -47,15 +47,15 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
     // private
     detectEdit: false,
 
     // private
     detectEdit: false,
 

-       /**
-        * @cfg {Boolean} autoEncode
-        * True to automatically HTML encode and decode values pre and post edit (defaults to false)
-        */
-       autoEncode : false,
+    /**
+     * @cfg {Boolean} autoEncode
+     * True to automatically HTML encode and decode values pre and post edit (defaults to false)
+     */
+    autoEncode : false,

 
 

-       /**
-        * @cfg {Boolean} trackMouseOver @hide
-        */
+    /**
+     * @cfg {Boolean} trackMouseOver @hide
+     */

     // private
     trackMouseOver: false, // causes very odd FF errors
 
     // private
     trackMouseOver: false, // causes very odd FF errors
 


@@ -73,7 +73,7 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
 
         this.activeEditor = null;
 
 
         this.activeEditor = null;
 

-           this.addEvents(
+        this.addEvents(

             /**
              * @event beforeedit
              * Fires before cell editing is triggered. The edit event object has the following properties <br />
             /**
              * @event beforeedit
              * Fires before cell editing is triggered. The edit event object has the following properties <br />


@@ -102,13 +102,13 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
              * <li>column - The grid column index</li>
              * </ul>
              *
              * <li>column - The grid column index</li>
              * </ul>
              *

-             * <pre><code> 
+             * <pre><code>

 grid.on('afteredit', afterEdit, this );
 
 function afterEdit(e) {
     // execute an XHR to send/commit data to the server, in callback do (if successful):
     e.record.commit();
 grid.on('afteredit', afterEdit, this );
 
 function afterEdit(e) {
     // execute an XHR to send/commit data to the server, in callback do (if successful):
     e.record.commit();

-}; 
+};

              * </code></pre>
              * @param {Object} e An edit event (see above for description)
              */
              * </code></pre>
              * @param {Object} e An edit event (see above for description)
              */


@@ -131,10 +131,10 @@ function afterEdit(e) {
              * records (not all).  By observing the grid's validateedit event, it can be cancelled if
              * the edit occurs on a targeted row (for example) and then setting the field's new value
              * in the Record directly:
              * records (not all).  By observing the grid's validateedit event, it can be cancelled if
              * the edit occurs on a targeted row (for example) and then setting the field's new value
              * in the Record directly:

-             * <pre><code> 
+             * <pre><code>

 grid.on('validateedit', function(e) {
   var myTargetRow = 6;
 grid.on('validateedit', function(e) {
   var myTargetRow = 6;

- 
+

   if (e.row == myTargetRow) {
     e.cancel = true;
     e.record.data[e.field] = e.value;
   if (e.row == myTargetRow) {
     e.cancel = true;
     e.record.data[e.field] = e.value;


@@ -165,6 +165,14 @@ grid.on('validateedit', function(e) {
         }
     },
 
         }
     },
 

+    onResize : function(){
+        Ext.grid.EditorGridPanel.superclass.onResize.apply(this, arguments);
+        var ae = this.activeEditor;
+        if(this.editing && ae){
+            ae.realign(true);
+        }
+    },
+

     // private
     onCellDblClick : function(g, row, col){
         this.startEditing(row, col);
     // private
     onCellDblClick : function(g, row, col){
         this.startEditing(row, col);


@@ -175,8 +183,8 @@ grid.on('validateedit', function(e) {
         if(e.button !== 0){
             return;
         }
         if(e.button !== 0){
             return;
         }

-        var row = this.view.findRowIndex(t);
-        var col = this.view.findCellIndex(t);
+        var row = this.view.findRowIndex(t),
+            col = this.view.findCellIndex(t);

         if(row !== false && col !== false){
             this.stopEditing();
             if(this.selModel.getSelectedCell){ // cell sm
         if(row !== false && col !== false){
             this.stopEditing();
             if(this.selModel.getSelectedCell){ // cell sm


@@ -195,10 +203,11 @@ grid.on('validateedit', function(e) {
     // private
     onEditComplete : function(ed, value, startValue){
         this.editing = false;
     // private
     onEditComplete : function(ed, value, startValue){
         this.editing = false;

+        this.lastActiveEditor = this.activeEditor;

         this.activeEditor = null;
         this.activeEditor = null;

-        
-               var r = ed.record;
-        var field = this.colModel.getDataIndex(ed.col);
+
+        var r = ed.record,
+            field = this.colModel.getDataIndex(ed.col);

         value = this.postEditValue(value, startValue, r, field);
         if(this.forceValidation === true || String(value) !== String(startValue)){
             var e = {
         value = this.postEditValue(value, startValue, r, field);
         if(this.forceValidation === true || String(value) !== String(startValue)){
             var e = {


@@ -229,17 +238,17 @@ grid.on('validateedit', function(e) {
         this.stopEditing();
         if(this.colModel.isCellEditable(col, row)){
             this.view.ensureVisible(row, col, true);
         this.stopEditing();
         if(this.colModel.isCellEditable(col, row)){
             this.view.ensureVisible(row, col, true);

-            var r = this.store.getAt(row);
-            var field = this.colModel.getDataIndex(col);
-            var e = {
-                grid: this,
-                record: r,
-                field: field,
-                value: r.data[field],
-                row: row,
-                column: col,
-                cancel:false
-            };
+            var r = this.store.getAt(row),
+                field = this.colModel.getDataIndex(col),
+                e = {
+                    grid: this,
+                    record: r,
+                    field: field,
+                    value: r.data[field],
+                    row: row,
+                    column: col,
+                    cancel:false
+                };

             if(this.fireEvent("beforeedit", e) !== false && !e.cancel){
                 this.editing = true;
                 var ed = this.colModel.getCellEditor(col, row);
             if(this.fireEvent("beforeedit", e) !== false && !e.cancel){
                 this.editing = true;
                 var ed = this.colModel.getCellEditor(col, row);


@@ -274,8 +283,16 @@ grid.on('validateedit', function(e) {
                     col: col
                 };
                 this.activeEditor = ed;
                     col: col
                 };
                 this.activeEditor = ed;

+                // Set the selectSameEditor flag if we are reusing the same editor again and
+                // need to prevent the editor from firing onBlur on itself.
+                ed.selectSameEditor = (this.activeEditor == this.lastActiveEditor);

                 var v = this.preEditValue(r, field);
                 ed.startEdit(this.view.getCell(row, col).firstChild, Ext.isDefined(v) ? v : '');
                 var v = this.preEditValue(r, field);
                 ed.startEdit(this.view.getCell(row, col).firstChild, Ext.isDefined(v) ? v : '');

+
+                // Clear the selectSameEditor flag
+                (function(){
+                    delete ed.selectSameEditor;
+                }).defer(50);

             }
         }
     },
             }
         }
     },


@@ -287,9 +304,9 @@ grid.on('validateedit', function(e) {
     },
 
     // private
     },
 
     // private

-       postEditValue : function(value, originalValue, r, field){
-               return this.autoEncode && Ext.isString(value) ? Ext.util.Format.htmlEncode(value) : value;
-       },
+    postEditValue : function(value, originalValue, r, field){
+        return this.autoEncode && Ext.isString(value) ? Ext.util.Format.htmlEncode(value) : value;
+    },

 
     /**
      * Stops any active editing
 
     /**
      * Stops any active editing


@@ -297,7 +314,8 @@ grid.on('validateedit', function(e) {
      */
     stopEditing : function(cancel){
         if(this.editing){
      */
     stopEditing : function(cancel){
         if(this.editing){

-            var ae = this.activeEditor;
+            // Store the lastActiveEditor to check if it is changing
+            var ae = this.lastActiveEditor = this.activeEditor;

             if(ae){
                 ae[cancel === true ? 'cancelEdit' : 'completeEdit']();
                 this.view.focusCell(ae.row, ae.col);
             if(ae){
                 ae[cancel === true ? 'cancelEdit' : 'completeEdit']();
                 this.view.focusCell(ae.row, ae.col);