Changeset 1575

Timestamp:

2010-06-28 14:05:24 (3 years ago)

Author:

freya

Message:

solves #229 : when deleting child : also clear element index

Location:

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

Files:

• collection.js (modified) (1 diff)
• control.js (modified) (1 diff)

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

@@ -246 +246 @@
     CollectionControl.prototype.removeChild = function(childIndex) {
         var child = this.getChild(childIndex);
+        
+        // element should be removed from element index as well
+        this._form.removeElementIndex(child._absoluteId, undefined, true);
 
         if (child == null)

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

@@ -701 +701 @@
       * @param {string}
       *            [relation] relation-part to remove
+      * @param (boolean)
+      *            [deleteChildren] set to true if you want all children to be deleted as well
       */
-     ControlElements.prototype.removeElementIndex = function(index, relation){
+     ControlElements.prototype.removeElementIndex = function(index, relation, deleteChildren){
+         deleteChildren = deleteChildren || false;
+         
          if (index == undefined) 
              return;
 
-         if(! relation){
-             delete this.elementIndex[index];
-         }
-         if(this.elementIndex[index] && this.elementIndex[index].meta[relation]){
-             delete this.elementIndex[index].meta[relation];
+         if(deleteChildren) {
+             for(var i in this.elementIndex){
+                 if(i.match("^"+index)==index){
+                     this.removeElementIndex(i, relation, false);
+                 }
+             }
+         }else{
+             if(! relation){
+                 delete this.elementIndex[index];
+             }
+             if(this.elementIndex[index] && this.elementIndex[index].meta[relation]){
+                 delete this.elementIndex[index].meta[relation];
+             }
          }
      }