Changeset 2410

Timestamp:

03/14/2008 09:42:39 AM (10 months ago)

Author:

tof

Message:

Fixed #671, #721

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• framework/Web/Javascripts/source/prado/validator/validation3.js (modified) (4 diffs)

trunk/HISTORY

@@ -2 +2 @@
 ============================
 BUG: Ticket#636 - I18N catalogue problem (Christophe)
+BUG: Ticket#671 - TActiveCustomValidator Callback Problem (Christophe)
 BUG: Ticket#707 - TPropertyAccess sets property twice on object when using setters (Qiang)
 BUG: Ticket#719 - TAutoCompleter should not trigger Validation if CausesValidation=False (Christophe)
+BUG: Ticket#721 - TActiveCustomValidator + TValidationSummary problem (Christophe)
 BUG: Ticket#736 - Files never created in clientscript.php (Qiang)
 BUG: Ticket#744 - Callback error handling is improved (Qiang)

trunk/framework/Web/Javascripts/source/prado/validator/validation3.js

@@ -411 +411 @@
                 }
 
-                var refresh = update || this.visible == false || this.options.Refresh != false;
-
+                var refresh = update || this.visible == false || this.options.Refresh != false; 
+                // Also, do not refresh summary if at least 1 validator is waiting for callback response.
+                // This will avoid the flickering of summary if the validator passes its test
+                refresh = refresh && validators.any(function(v) { return !v.requestDispatched; });
+                
                 if(this.options.ShowSummary != false && refresh)
                 {
@@ -1151 +1154 @@
 {
         validatingValue : null,
-
+        invoker : null,
+
+        /**
+         * Override the parent implementation to store the invoker, in order to 
+         * re-validate after the callback has returned
+         * Calls evaluateIsValid() function to set the value of isValid property.
+         * Triggers onValidate event and onSuccess or onError event.
+         * @param HTMLElement element that calls for validation
+         * @return boolean true if valid.
+         */
+        validate : function(invoker)
+        {
+                this.invoker = invoker;
+                
+                //try to find the control.
+                if(!this.control)
+                        this.control = $(this.options.ControlToValidate);
+
+                if(!this.control || this.control.disabled)
+                {
+                        this.isValid = true;
+                        return this.isValid;
+                }
+
+                if(typeof(this.options.OnValidate) == "function")
+                {
+                        if(this.requestDispatched == false)
+                                this.options.OnValidate(this, invoker);
+                }
+
+                if(this.enabled && !this.control.getAttribute('disabled'))
+                        this.isValid = this.evaluateIsValid();
+                else
+                        this.isValid = true;
+
+                // Only update the message if the callback has already return !
+                if (!this.requestDispatched)
+                        this.updateValidationDisplay(invoker);
+                        
+                this.observeChanges(this.control);
+
+                return this.isValid;
+        },
+        
         /**
          * Calls custom validation function.
@@ -1159 +1205 @@
                 value = this.getValidationValue();
                 if(!this.requestDispatched && (""+value) != (""+this.validatingValue))
-                //if((""+value) != (""+this.validatingValue))
                 {
                         this.validatingValue = value;
@@ -1183 +1228 @@
                         this.options.onSuccess(request,data);
                 this.updateValidationDisplay();
+                this.manager.updateSummary(this.group);
+                // Redispatch initial request if any
+                if (this.invoker instanceof Prado.CallbackRequest)
+                {
+                        this.invoker.dispatch();
+                }
+                
         },