Upgrade to ExtJS 3.2.0 - Released 03/30/2010

[extjs.git] / src / widgets / Editor.js

diff --git a/src/widgets/Editor.js b/src/widgets/Editor.js
index cc475eb..14da542 100644 (file)
--- a/src/widgets/Editor.js
+++ b/src/widgets/Editor.js
@@ -1,6 +1,6 @@
 /*!
 /*!

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

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


@@ -32,8 +32,9 @@ Ext.extend(Ext.Editor, Ext.Component, {
     /**
      * @cfg {Boolean} allowBlur
      * True to {@link #completeEdit complete the editing process} if in edit mode when the
     /**
      * @cfg {Boolean} allowBlur
      * True to {@link #completeEdit complete the editing process} if in edit mode when the

-     * field is blurred. Defaults to <tt>false</tt>.
+     * field is blurred. Defaults to <tt>true</tt>.

      */
      */

+    allowBlur: true,

     /**
      * @cfg {Boolean/String} autoSize
      * True for the editor to automatically adopt the size of the underlying field, "width" to adopt the width only,
     /**
      * @cfg {Boolean/String} autoSize
      * True for the editor to automatically adopt the size of the underlying field, "width" to adopt the width only,


@@ -202,7 +203,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
                 this.cancelEdit();
             }
             if(field.triggerBlur){
                 this.cancelEdit();
             }
             if(field.triggerBlur){

-                field.triggerBlur(); 
+                field.triggerBlur();

             }
         }
         this.fireEvent('specialkey', field, e);
             }
         }
         this.fireEvent('specialkey', field, e);


@@ -291,6 +292,10 @@ Ext.extend(Ext.Editor, Ext.Component, {
         if(!this.editing){
             return;
         }
         if(!this.editing){
             return;
         }

+        // Assert combo values first
+        if (this.field.assertValue) {
+            this.field.assertValue();
+        }

         var v = this.getValue();
         if(!this.field.isValid()){
             if(this.revertInvalid !== false){
         var v = this.getValue();
         if(!this.field.isValid()){
             if(this.revertInvalid !== false){


@@ -336,7 +341,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
             this.fireEvent("canceledit", this, v, this.startValue);
         }
     },
             this.fireEvent("canceledit", this, v, this.startValue);
         }
     },

-    
+

     // private
     hideEdit: function(remainVisible){
         if(remainVisible !== true){
     // private
     hideEdit: function(remainVisible){
         if(remainVisible !== true){


@@ -347,7 +352,8 @@ Ext.extend(Ext.Editor, Ext.Component, {
 
     // private
     onBlur : function(){
 
     // private
     onBlur : function(){

-        if(this.allowBlur !== true && this.editing){
+        // selectSameEditor flag allows the same editor to be started without onBlur firing on itself
+        if(this.allowBlur === true && this.editing && this.selectSameEditor !== true){

             this.completeEdit();
         }
     },
             this.completeEdit();
         }
     },


@@ -386,7 +392,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
 
     beforeDestroy : function(){
         Ext.destroyMembers(this, 'field');
 
     beforeDestroy : function(){
         Ext.destroyMembers(this, 'field');

-        
+

         delete this.parentEl;
         delete this.boundEl;
     }
         delete this.parentEl;
         delete this.boundEl;
     }