Changeset 1879 for trunk

Timestamp:

2011-04-05 22:18:43 (14 months ago)

Author:

mpo

Message:

fixes #451, thx to Ives for spotting and providing the test.
In stead of delegating a show() to the selected case child we now opt for resetting its 'showstate' based on the initial settings of the control.
This allows passing the test, and is IMHO preferable to keeping track off the last state of that child.

Location:

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

Files:

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

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

@@ -258 +258 @@
             if (valueControl) {
                 me.putChild("value", valueControl);
-                valueControl.show();
+                valueControl.resetShowState(); // don't just show, restore initial view state
             }else{
                 if(me.nullable)
@@ -295 +295 @@
         for (i in me._valueControls) {
           if (me._valueControls[i] === me.getChild("value")) {
-            me._valueControls[i].show();
+            me._valueControls[i].resetShowState(); // do not just make visible, but apply initial view state
           } else {
             me._valueControls[i].hide();
@@ -324 +324 @@
             cfn("value", this.getChild("value"));
         }
+        
+        this.getChild("value").resetShowState();
     }
     

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

@@ -1456 +1456 @@
         me.updateValidationClasses();
         
+        me.resetShowState();        
+    }
+    
+    Control.prototype.resetShowState = function() {
+        Control.resetShowState(this);
+    }
+
+    Control.resetShowState = function(me) {
         if (me.isEnabled()) {
             me.enable();
@@ -1462 +1470 @@
         }
         
-        if(me.initial.show != undefined) {
-            if (me.initial.show) {
-                me.show();
-            } else {
-                me.hide();
-            }
-        }
-        
-    }
-    
+        if (!!me.initial.show) {
+            me.show();
+        } else {
+            me.hide();
+        }
+    }
+
     /**
     * closes a control
@@ -2303 +2308 @@
          AbstractContainerControl.reset(this);
     };
+    
     AbstractContainerControl.reset = function(me){
         if (me.initial.value == undefined) {
@@ -2312 +2318 @@
         }
     };
+    
     AbstractContainerControl.childReset = function(i, child) {
         child.reset();
+    };
+
+    AbstractContainerControl.prototype.resetShowState = function() {
+        Control.resetShowState(this);
+        this.eachChild(AbstractContainerControl.childResetShowState);
+    };
+    
+    AbstractContainerControl.childResetShowState = function (i, child) {
+        child.resetShowState();
     };
 

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

@@ -88 +88 @@
     caseTest(true); // split html
 });
+
+test("visibility of composite case members (see #451)", function() {
+
+  // create
+  var $main = $('#main').show();
+
+  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": "composite",
+                    "members": {
+                      "member1": {
+                        "base": "string",
+                        "label": "Text",
+                        "control": {
+                            "base": "input-control",
+                            "initial": {
+                              "value": "Enter text",
+                              "enable": false
+                            }
+                        }
+                      },
+                      "member2": {
+                        "base": "string",
+                        "label": "Text",
+                        "control": {
+                            "base": "input-control",
+                            "initial": {
+                              "value": "Enter text",
+                              "show": false
+                            }
+                        }
+                      }
+                    }
+                },
+                "n" : {
+                    "base": "string"
+                }
+            }
+          }   
+      }
+  };
+
+  var form = new $.org.kauriproject.forms.Form($form, fconf);
+  
+  
+  var caset = form.findControl('/c/case-t');
+  var $caset = caset.getElement();
+  
+  var member1 = form.findControl('/c/case-t/member1');
+  var $member1 = member1.getElement();
+  
+  var member2 = form.findControl('/c/case-t/member2');
+  var $member2 = member2.getElement();
+  
+  expect(3);
+  
+  ok(!$caset.is(':hidden'), "checking that default case is visible.");
+  ok($member1.is(':disabled'), "checking that first member is disabled.");
+  ok($member2.is(':hidden'), "checking that second member is hidden.");
+  
+  // cleanup
+  $main.html("").hide();
+     
+});