Changeset 1873 for trunk

Timestamp:

2011-03-15 08:53:20 (14 months ago)

Author:

mpo

Message:

fixes #449. Thanx to Ives for spotting and the elegant testcase.
By introducing a third argument (boolean) to eachChild() method we can specify looping needs to pass also in-active children. This is needed for the special behavior of the case control (who has only one of its value-control children active at any given time)

Location:

trunk/modules/kauri-forms/kauri-forms-framework/src

Files:

• main/kauri/static-{build}.key/kauri.forms/case.js (modified) (1 diff)
• main/kauri/static-{build}.key/kauri.forms/control.js (modified) (3 diffs)
• test/kauri.forms/test-form.js (modified) (1 diff)

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

@@ -197 +197 @@
     }
     
+    /**
+     * Gets all child controls
+     * @return object containing all the children
+     * @param includeAll boolean indicating if the 'hidden' children of this container should be included (see case-control)
+     * @type Object
+     */
+    CaseControl.prototype.getChildren = function(includeAll) {
+        includeAll = includeAll || false;
+        if (includeAll)
+            return this._valueControls;
+        return
+            this["<super.call>"]("getChildren");
+        
+    }
     
     /**

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

@@ -2108 +2108 @@
      * Loops through all children and exectues the passed function in turn with each name/index and child as argument
      * @param fn(index, child) callback function for each child
-     */
-    AbstractContainerControl.prototype.eachChild = function(fn, stopable) {
+     * @param stopable  boolean specifiying if the first false return will stop processing to other children
+     * @param includeAll boolean indicating if the 'hidden' children of this container should be included (see case-control)
+     */
+    AbstractContainerControl.prototype.eachChild = function(fn, stopable, includeAll) {
         stopable = stopable || false;
+        includeAll = includeAll || false;
         if (!$.isFunction(fn)) {
             return;
         }
         //else
-        var children = this.getChildren();
+        var children = this.getChildren(includeAll);
         if (!stopable) {
             for (var i in children) {
@@ -2375 +2378 @@
      * Gets all child controls
      * @return object containing all the children
+     * @param includeAll boolean indicating if the 'hidden' children of this container should be included (see case-control)
      * @type Object
      */
@@ -2663 +2667 @@
             if (child.delegates)
                 child.delegate.apply(child, args); 
-        });
+        }, false, true);
     }
      

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-form.js

@@ -727 +727 @@
 });
 
+
+test("delegation of case-control issue #449", function() {
+
+    // create
+    var $main = $('#main').show();
+    
+    var delegatesExecuted = [];
+
+    var $form = $('<form></form>').appendTo($main);
+    var fconf = {
+
+        members : {
+            'c' : {
+              base: 'case',
+              "+validators": { "required": {} },
+              "control": {
+                  "base": "case-control",
+                  "nullable": false,
+                  "initial":{"value": {"case":"t"}}
+              },
+              "cases": {
+                  "t" : {
+                      "base": "string",
+                      control: 'my-test-control'
+                  },
+                  "n" : {
+                      "base": "string",
+                      control: 'my-test-control'
+                  }
+              }
+            }   
+        },
+
+        controlTypes : {
+            'my-test-control' : {
+                base :'input-control',
+                delegates: true,
+                testDelegate: function(x) {
+                  delegatesExecuted[delegatesExecuted.length] = this.getId();
+                },
+                initial: {value: "s"}
+            }
+        }
+    };
+
+    var form = new $.org.kauriproject.forms.Form($form, fconf);
+    
+    expect(2);
+
+    form.delegate("testDelegate", "x");
+    
+    ok($.inArray("case-t", delegatesExecuted) > -1, "checking delegation ran for active case.");
+    ok($.inArray("case-n", delegatesExecuted) > -1, "checking delegation ran for non-active case.");
+    
+    // cleanup
+    $main.html("").hide();
+       
+});
+
+
 test("inital valid-state of various container controls", function() {