Upgrade to ExtJS 3.3.1 - Released 11/30/2010

[extjs.git] / src / widgets / form / BasicForm.js

diff --git a/src/widgets/form/BasicForm.js b/src/widgets/form/BasicForm.js
index f07d65e..2de4614 100644 (file)
--- a/src/widgets/form/BasicForm.js
+++ b/src/widgets/form/BasicForm.js
@@ -1,8 +1,8 @@
 /*!
 /*!

- * Ext JS Library 3.1.1
- * Copyright(c) 2006-2010 Ext JS, LLC
- * licensing@extjs.com
- * http://www.extjs.com/license
+ * Ext JS Library 3.3.1
+ * Copyright(c) 2006-2010 Sencha Inc.
+ * licensing@sencha.com
+ * http://www.sencha.com/license

  */
 /**
  * @class Ext.form.BasicForm
  */
 /**
  * @class Ext.form.BasicForm


@@ -35,7 +35,7 @@
  * @param {Object} config Configuration options
  */
 Ext.form.BasicForm = Ext.extend(Ext.util.Observable, {
  * @param {Object} config Configuration options
  */
 Ext.form.BasicForm = Ext.extend(Ext.util.Observable, {

-    
+

     constructor: function(el, config){
         Ext.apply(this, config);
         if(Ext.isString(this.paramOrder)){
     constructor: function(el, config){
         Ext.apply(this, config);
         if(Ext.isString(this.paramOrder)){


@@ -76,9 +76,9 @@ Ext.form.BasicForm = Ext.extend(Ext.util.Observable, {
         if(el){
             this.initEl(el);
         }
         if(el){
             this.initEl(el);
         }

-        Ext.form.BasicForm.superclass.constructor.call(this);    
+        Ext.form.BasicForm.superclass.constructor.call(this);

     },
     },

-    
+

     /**
      * @cfg {String} method
      * The request method to use (GET or POST) for form actions if one isn't supplied in the action options.
     /**
      * @cfg {String} method
      * The request method to use (GET or POST) for form actions if one isn't supplied in the action options.


@@ -184,7 +184,7 @@ paramOrder: 'param1|param2|param'
      * <tt>{@link #paramOrder}</tt> nullifies this configuration.
      */
     paramsAsHash: false,
      * <tt>{@link #paramOrder}</tt> nullifies this configuration.
      */
     paramsAsHash: false,

-    
+

     /**
      * @cfg {String} waitTitle
      * The default title to show for the waiting message box (defaults to <tt>'Please Wait...'</tt>)
     /**
      * @cfg {String} waitTitle
      * The default title to show for the waiting message box (defaults to <tt>'Please Wait...'</tt>)


@@ -278,15 +278,20 @@ new Ext.FormPanel({
         e.stopEvent();
     },
 
         e.stopEvent();
     },
 

-    // private
-    destroy: function() {
-        this.items.each(function(f){
-            Ext.destroy(f);
-        });
-        if(this.el){
-            this.el.removeAllListeners();
-            this.el.remove();
+    /**
+     * Destroys this object.
+     * @private
+     * @param {Boolean} bound true if the object is bound to a form panel. If this is the case
+     * the FormPanel will take care of destroying certain things, so we're just doubling up.
+     */
+    destroy: function(bound){
+        if(bound !== true){
+            this.items.each(function(f){
+                Ext.destroy(f);
+            });
+            Ext.destroy(this.el);

         }
         }

+        this.items.clear();

         this.purgeListeners();
     },
 
         this.purgeListeners();
     },
 


@@ -435,8 +440,9 @@ myFormPanel.getForm().submit({
      * @return {BasicForm} this
      */
     submit : function(options){
      * @return {BasicForm} this
      */
     submit : function(options){

+        options = options || {};

         if(this.standardSubmit){
         if(this.standardSubmit){

-            var v = this.isValid();
+            var v = options.clientValidation === false || this.isValid();

             if(v){
                 var el = this.el.dom;
                 if(this.url && Ext.isEmpty(el.action)){
             if(v){
                 var el = this.el.dom;
                 if(this.url && Ext.isEmpty(el.action)){


@@ -469,11 +475,22 @@ myFormPanel.getForm().submit({
      */
     updateRecord : function(record){
         record.beginEdit();
      */
     updateRecord : function(record){
         record.beginEdit();

-        var fs = record.fields;
+        var fs = record.fields,
+            field,
+            value;

         fs.each(function(f){
         fs.each(function(f){

-            var field = this.findField(f.name);
+            field = this.findField(f.name);

             if(field){
             if(field){

-                record.set(f.name, field.getValue());
+                value = field.getValue();
+                if (typeof value != undefined && value.getGroupValue) {
+                    value = value.getGroupValue();
+                } else if ( field.eachItem ) {
+                    value = [];
+                    field.eachItem(function(item){
+                        value.push(item.getValue());
+                    });
+                }
+                record.set(f.name, value);

             }
         }, this);
         record.endEdit();
             }
         }, this);
         record.endEdit();


@@ -494,6 +511,12 @@ myFormPanel.getForm().submit({
 
     // private
     beforeAction : function(action){
 
     // private
     beforeAction : function(action){

+        // Call HtmlEditor's syncValue before actions
+        this.items.each(function(f){
+            if(f.isFormField && f.syncValue){
+                f.syncValue();
+            }
+        });

         var o = action.options;
         if(o.waitMsg){
             if(this.waitMsgTarget === true){
         var o = action.options;
         if(o.waitMsg){
             if(this.waitMsgTarget === true){


@@ -539,15 +562,25 @@ myFormPanel.getForm().submit({
      * {@link Ext.grid.Column#dataIndex dataIndex}, {@link Ext.form.Field#getName name or hiddenName}).
      * @return Field
      */
      * {@link Ext.grid.Column#dataIndex dataIndex}, {@link Ext.form.Field#getName name or hiddenName}).
      * @return Field
      */

-    findField : function(id){
+    findField : function(id) {

         var field = this.items.get(id);
         var field = this.items.get(id);

-        if(!Ext.isObject(field)){
-            this.items.each(function(f){
-                if(f.isFormField && (f.dataIndex == id || f.id == id || f.getName() == id)){
-                    field = f;
-                    return false;
+
+        if (!Ext.isObject(field)) {
+            //searches for the field corresponding to the given id. Used recursively for composite fields
+            var findMatchingField = function(f) {
+                if (f.isFormField) {
+                    if (f.dataIndex == id || f.id == id || f.getName() == id) {
+                        field = f;
+                        return false;
+                    } else if (f.isComposite) {
+                        return f.items.each(findMatchingField);
+                    } else if (f instanceof Ext.form.CheckboxGroup && f.rendered) {
+                        return f.eachItem(findMatchingField);
+                    }

                 }
                 }

-            });
+            };
+
+            this.items.each(findMatchingField);

         }
         return field || null;
     },
         }
         return field || null;
     },


@@ -559,7 +592,7 @@ myFormPanel.getForm().submit({
      * @return {BasicForm} this
      */
     markInvalid : function(errors){
      * @return {BasicForm} this
      */
     markInvalid : function(errors){

-        if(Ext.isArray(errors)){
+        if (Ext.isArray(errors)) {

             for(var i = 0, len = errors.length; i < len; i++){
                 var fieldError = errors[i];
                 var f = this.findField(fieldError.id);
             for(var i = 0, len = errors.length; i < len; i++){
                 var fieldError = errors[i];
                 var f = this.findField(fieldError.id);


@@ -567,7 +600,7 @@ myFormPanel.getForm().submit({
                     f.markInvalid(fieldError.msg);
                 }
             }
                     f.markInvalid(fieldError.msg);
                 }
             }

-        }else{
+        } else {

             var field, id;
             for(id in errors){
                 if(!Ext.isFunction(errors[id]) && (field = this.findField(id))){
             var field, id;
             for(id in errors){
                 if(!Ext.isFunction(errors[id]) && (field = this.findField(id))){


@@ -575,6 +608,7 @@ myFormPanel.getForm().submit({
                 }
             }
         }
                 }
             }
         }

+

         return this;
     },
 
         return this;
     },
 


@@ -646,12 +680,12 @@ myFormPanel.getForm().submit({
             n,
             key,
             val;
             n,
             key,
             val;

-        this.items.each(function(f){
-            if(dirtyOnly !== true || f.isDirty()){
+        this.items.each(function(f) {
+            if (!f.disabled && (dirtyOnly !== true || f.isDirty())) {

                 n = f.getName();
                 key = o[n];
                 val = f.getValue();
                 n = f.getName();
                 key = o[n];
                 val = f.getValue();

-                
+

                 if(Ext.isDefined(key)){
                     if(Ext.isArray(key)){
                         o[n].push(val);
                 if(Ext.isDefined(key)){
                     if(Ext.isArray(key)){
                         o[n].push(val);


@@ -706,7 +740,6 @@ myFormPanel.getForm().submit({
         return this;
     },
 
         return this;
     },
 

-

     /**
      * Removes a field from the items collection (does NOT remove its markup).
      * @param {Field} field
     /**
      * Removes a field from the items collection (does NOT remove its markup).
      * @param {Field} field


@@ -717,6 +750,13 @@ myFormPanel.getForm().submit({
         return this;
     },
 
         return this;
     },
 

+    /**
+     * Removes all fields from the collection that have been destroyed.
+     */
+    cleanDestroyed : function() {
+        this.items.filterBy(function(o) { return !!o.isDestroyed; }).each(this.remove, this);
+    },
+

     /**
      * Iterates through the {@link Ext.form.Field Field}s which have been {@link #add add}ed to this BasicForm,
      * checks them for an id attribute, and calls {@link Ext.form.Field#applyToMarkup} on the existing dom element with that id.
     /**
      * Iterates through the {@link Ext.form.Field Field}s which have been {@link #add add}ed to this BasicForm,
      * checks them for an id attribute, and calls {@link Ext.form.Field#applyToMarkup} on the existing dom element with that id.


@@ -767,4 +807,4 @@ myFormPanel.getForm().submit({
 });
 
 // back compat
 });
 
 // back compat

-Ext.BasicForm = Ext.form.BasicForm;
\ No newline at end of file
+Ext.BasicForm = Ext.form.BasicForm;