Changeset 1863 for trunk

Timestamp:

2011-02-22 15:00:38 (15 months ago)

Author:

mpo

Message:

fixes #446
By making sure we call to updateValidationClasses for all containers.
And by making the logic of that method not hook back into the isValid() method itself: but purely check on value-states
Patch includes an in depth test for case, composite and form

Location:

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

Files:

• main/kauri/static-{build}.key/kauri.forms/case.js (modified) (2 diffs)
• 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

@@ -263 +263 @@
     };
     CaseControl.reset = function(me) {
-        me.valueState = me.STATE_INIT;
         // reset children: first elements in me._valueControls, then me.caseControl
         for (i in me._valueControls) {
@@ -288 +287 @@
           };
         }
+
+        me.valueState = me.STATE_INIT;
+        me.updateValidationClasses();
     }
     

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

@@ -1450 +1450 @@
 
     Control.reset = function(me) {
-        if( ! (me.value === me.initial.value && me.valueState == Control.STATE_INIT))        
+        if( ! (me.value === me.initial.value && me.valueState == Control.STATE_INIT)) {        
             me.setWireValue(me.initial.value, true);
+        }
         me.valueState = Control.STATE_INIT;
+        me.updateValidationClasses();
         
         if (me.isEnabled()) {
@@ -1817 +1819 @@
           
           if(mrkElm){
-              if (this.valueState == Control.STATE_INIT) {
-                  mrkElm.removeClass("invalid").removeClass("valid");
-              } else if (this.isValid()) {
+              if (this.valueState == Control.STATE_INVALID) {
+                  mrkElm.removeClass("valid").addClass("invalid");
+              } else if (this.valueState == Control.STATE_VALID) {
                   mrkElm.removeClass("invalid").addClass("valid");
               } else {
-                  mrkElm.removeClass("valid").addClass("invalid");
+                  mrkElm.removeClass("invalid").removeClass("valid");
               }
           }
@@ -2294 +2296 @@
     };
     AbstractContainerControl.reset = function(me){
-        me.valueState = Control.STATE_INIT;
         if (me.initial.value == undefined) {
             me.eachChild(AbstractContainerControl.childReset);
+            me.valueState = Control.STATE_INIT;
+            me.updateValidationClasses();
         } else {
             Control.reset(me);

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

@@ -726 +726 @@
        
 });
+
+test("inital valid-state of various container controls", function() {
+
+    // create
+    var $main = $('#main').show();
+
+    var id = "f7";
+
+    var allWellValidator = makeMockValidator(function() {return true;})[0];
+    
+    var $form = $('<form id="' + id + '" ></form>').appendTo($main);
+    var fconf = {
+
+        members : {
+            'simple': 'string',
+            'compos' : {
+                base : 'composite', 
+                members  : {
+                    'simple': 'string', 
+                    'another': 'string'
+                },
+                validators: [allWellValidator]
+            },
+            'casus': {
+                base: 'case',
+                cases: {
+                    'simple': 'string',
+                    'another': 'string'
+                }
+            }
+        }
+    };
+
+    var form = new $.org.kauriproject.forms.Form($form, fconf);
+    var casus = form.findControl('casus');
+    var $casus = casus.getElement();
+    var compos = form.findControl('compos');
+    var $compos = compos.getElement();
+    
+    var assertValidState = function (when, valid) { // includes 18 assertions
+        var classValidDescr = "valid";
+        if (valid == undefined) {
+            valid = false; // neutral tests yield no valid mark
+            classValidDescr = "neutral"
+        }
+        
+        equals($casus.hasClass('valid'), valid, "casus should be " + classValidDescr + ".("+when+")");
+        equals($casus.hasClass('invalid'), false, "including no invalid markers.("+when+")");
+        equals(casus.isValid(false), valid, "casus has never been validated, it should be " + classValidDescr + ".("+when+")");
+        equals(casus.isValid(true), true, "but it should be actually valid when checking it.("+when+")");
+        equals($casus.hasClass('valid'), true, "and after checking should be marked as such.("+when+")");
+        equals($casus.hasClass('invalid'), false, "not even invalid ones.("+when+")");
+
+        equals($compos.hasClass('valid'), valid, "compos should be " + classValidDescr + ".("+when+")");
+        equals($compos.hasClass('invalid'), false, "and not invalid.("+when+")");
+        equals(compos.isValid(false), valid, "compos has never been validated, it should be " + classValidDescr + ".("+when+")");
+        equals(compos.isValid(true), true, "but it should be actually valid when checking it.("+when+")");
+        equals($compos.hasClass('valid'), true, "and after checking should be marked as such because it has an own validator.("+when+")");
+        equals($compos.hasClass('invalid'), false, "and thus not have an invalid mark.("+when+")");
+
+        equals($form.hasClass('valid'), valid, "form should be " + classValidDescr + ".("+when+")");
+        equals($form.hasClass('invalid'), false, "including no invalid markers.("+when+")");
+        equals(form.isValid(false), valid, "form has never been validated, it should be " + classValidDescr + ".("+when+")");
+        equals(form.isValid(true), true, "but it turns out to be valid if we really check it.("+when+" and forced validation)");
+        equals($form.hasClass('valid'), true, "and should also carry the mark. ("+when+" and forced validation)");
+        equals($form.hasClass('invalid'), false, "including no invalid markers.("+when+" and forced validation)");
+    }
+    
+
+    expect(1 + 3*18);
+    
+    isSet(form.getElement(), $form,  "the form is the form of course");
+    assertValidState("after creation"); // validstate of css is unmarked
+
+    form.setValue();
+    assertValidState("after value set", true); //validstate of css marked TRUE
+    
+    form.reset();
+    assertValidState("after reset"); //validstate of css is unmarked
+    
+    
+    // cleanup
+    $main.html("").hide();
+});