Changeset 1430

Timestamp:

23/12/09 14:19:22 (3 months ago)

Author:

karel

Message:

Don't validate disabled controls

Files:

• trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/control.js (modified) (3 diffs)

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

@@ -1245 +1245 @@
-     */
-    Control.prototype.newValidation = function(value, wireValue){
+        if (this.operationalState == Control.STATE_DISABLED) {
+            this.valueState = Control.STATE_VALID;
+            return;
+        }
-        if (this.getType().validators.length == 0) {
-            // if there are no validators then we must assume that the control is valid
@@ -1476 +1480 @@
-        }
-        this.operationalState = Control.STATE_ENABLED;
+        // If the control isn't in STATE_INIT, we should re-validate to restore validation messages that may have been present when disable() was called
+        if (this.valueState != Control.STATE_INIT) {
+          this.newValidation(this.getValue(), this.getWireValue());
+        };
-    }
-    
@@ -1489 +1497 @@
-            el.addClass("disabled");
-        }
+        this.clearMessage();
-        this.operationalState = Control.STATE_DISABLED;
-    }