Changeset 951

Timestamp:

2008-12-04 15:10:06 (4 years ago)

Author:

freya

Message:

in getImplicitFconf: do iteration only if type != undefined

File:

• trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static/js/control.js (modified) (1 diff)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static/js/control.js

@@ -206 +206 @@
         
         for (var index in this.elementIndex) {
-            var segments = index.split('/');
-            var control=fconf;
-
-            // search in fconf which control to edit
-            for (i = 0; i < segments.length; i++) {
-                if (segments[i] == "") {
-                    continue;
-                }
-                else {
-                    if(control.base=='collection'){
-                        if(control['row']==undefined)
-                            control['row']={};
-                        control=control['row'];
+            if (this.elementIndex[index].type != undefined) {
+                var segments = index.split('/');
+                var control = fconf;
+                
+                // search in fconf which control to edit
+                for (i = 0; i < segments.length; i++) {
+                    if (segments[i] == "") {
+                        continue;
                     }
-                    if (control['members'] != undefined && control['members'][segments[i]] != undefined) 
-                        control = control['members'][segments[i]];
                     else {
-                        if (control['members'] == undefined) {
-                            control['members'] = {};
+                        if (control.base == 'collection') {
+                            if (control['row'] == undefined) 
+                                control['row'] = {};
+                            control = control['row'];
                         }
-                        control = control['members'];
+                        if (control['members'] != undefined && control['members'][segments[i]] != undefined) 
+                            control = control['members'][segments[i]];
+                        else {
+                            if (control['members'] == undefined) {
+                                control['members'] = {};
+                            }
+                            control = control['members'];
+                        }
                     }
-                }
-            }
-
-            if (this.elementIndex[index].type != undefined) {
+                }                
                 var type = {};
                 type['base'] = this.elementIndex[index].type;