Changeset 1481

Timestamp:

2010-04-01 13:59:29 (3 years ago)

Author:

freya

Message:

bugfix: reading initial properties from implicit fconf caused strange side effects

File:

• trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/control.js (modified) (2 diffs)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/control.js

@@ -208 +208 @@
             store.addTypeAndControl(index, $this.attr(ControlElements.ATTR_TYPE), $this.attr(ControlElements.ATTR_CONTROL));
             
-            var valueAttr = $this.attr("value");
-            var disabledAttr = $this.attr("disabled");
-            var typeAttr = $this.attr("type");
-
-            if(valueAttr || disabledAttr || typeAttr) {
-                var initial = {};
-                initial.value = valueAttr;
-                initial.disabled = disabledAttr;
-                initial.type = typeAttr;
-                store.addInitialProperties(index, initial);
+            if(!forceReIndexing) {
+                var valueAttr = $this.attr("value");
+                var disabledAttr = $this.attr("disabled");
+                var typeAttr = $this.attr("type");
+    
+                if(valueAttr || disabledAttr || typeAttr) {
+                    var initial = {};
+                    initial.value = valueAttr;
+                    initial.disabled = disabledAttr;
+                    initial.type = typeAttr;
+                    store.addInitialProperties(index, initial);
+                }
             }
         };
@@ -341 +343 @@
                 if (this.elementIndex[index].initial){
                     type['control'] = type['control'] || {};
+                    
                     if(!type['control'].base){
                         // if base type of control is not filled in : default to control of fieldtype
                         var fieldtype = this.fieldTypes.get(type['base']);
-                        var control = (new fieldtype).control;
-                        type['control'].base = control;
+                        var controlType = (new fieldtype).control;
+                        type['control'].base = controlType;
                     }
                     type['control']['initial'] = this.elementIndex[index].initial;