Changeset 1648

Timestamp:

2010-08-06 13:02:51 (3 years ago)

Author:

freya

Message:

• See #263 : conditional validator. you can add a 'isEnabled' method to a validator to sepcify whether or not to enable the validation.

Location:

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

Files:

• case.js (modified) (3 diffs)
• control.js (modified) (6 diffs)
• field.js (modified) (1 diff)
• validator.js (modified) (1 diff)

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

@@ -192 +192 @@
             options.set(optionValues, optionLabels);
         
-        var noValidation = (this.valueState == kf.Control.STATE_INIT);
-        caseControl.setWireValue(optionValues[0], noValidation);
+        caseControl.setWireValue(optionValues[0]);
         
         this.putChild("case", caseControl);      
@@ -230 +229 @@
         var caseControl = this.getChild("case");
         // we are now setting the valueChanged handler
-        caseControl.valueChanged(function (evt) {
+        caseControl.valueChanged(function (evt, novalidation) {
             var selectedCase = me.getChild("case").getWireValue();
             // hide the old value
@@ -251 +250 @@
                     me.setMessage("Sorry but " + selectedCase + " is not a valid value");
             }
-            
-            me.newValidation(this.getValue(), this.getWireValue());
+            var noValidation = (this.valueState == kf.Control.STATE_INIT); 
+            if(!noValidation)
+                me.newValidation(this.getValue(), this.getWireValue());
         });
     }

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

@@ -1450 +1450 @@
         if( ! (me.value === me.initial.value && me.valueState == Control.STATE_INIT))        
             me.setWireValue(me.initial.value, true);
-        me.valueState = Control.STATE_INIT;
+        me.clearValidationClasses();
         
         if (me.isEnabled()) {
@@ -1553 +1553 @@
                     }
                     else {
-                        me.valueState = Control.STATE_INIT; // mark that this value isn't validated yet.
+                        //me.valueState = Control.STATE_INIT; // mark that this value isn't validated yet.
                         me.clearMessage(); // and clear messages
+                        me.clearValidationClasses();
                     }
                 } finally {
@@ -1675 +1676 @@
      */
     Control.prototype.newValidation = function(value, wireValue){
-        if (this.operationalState == Control.STATE_DISABLED) {
+         if (this.operationalState == Control.STATE_DISABLED) {
             this.valueState = Control.STATE_VALID;
             return;
@@ -1728 +1729 @@
         this.validationMessages = [];
         this.clearMessage();
+        this.clearValidationClasses();
     }
     
@@ -1794 +1796 @@
     
         this.setMessage("");
-    }
+     }
 
      /**
@@ -2458 +2460 @@
         }); // inline overwrite the getParent method on the child being created 
         var childControl = form.controlTypes.getInstance(controlType, extender, [id, form, type]); // constructor args
+        var noValidation = (this.valueState == kf.Control.STATE_INIT);
         var childChanged = function(){
         
-            me.updateValue();
+            me.updateValue(noValidation);
             
         }

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

@@ -529 +529 @@
                 var v = myValidators[j];
                 v.inSequence(listener, seqId);
-                v.validate(values[i], validationData);
+                
+                if(v.isEnabled()) {
+                    v.validate(values[i], validationData);
+                }
             }
         }

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

@@ -93 +93 @@
         return this.notify(true);
     }
+    
+    /**
+    * specify whether or not the validator should be enabled
+    * @return true by default
+    */
+    Validator.prototype.isEnabled = function( ) {
+       return true;
+   }
 
     /**