Changeset 1467

Timestamp:

10/18/2006 07:57:08 PM (2 years ago)

Author:

wei

Message:

BC BREAK: Changed Validator property names:

- Validators ClientSide?.OnSuccess? becomes ClientSide?.OnValidationSuccess?,
- Validators ClientSide?.OnError? becomes ClientSide?.OnValidationError?,
- Validators OnSuccess? event becomes OnValidationSuccess?.
- Validators OnError? event becomes OnValidationError?.

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• UPGRADE (modified) (1 diff)
• framework/Web/Javascripts/js/compressed/validator.js (modified) (2 diffs)
• framework/Web/Javascripts/js/debug/validator.js (modified) (4 diffs)
• framework/Web/Javascripts/prado/validation3.js (modified) (4 diffs)
• framework/Web/UI/ActiveControls/TActiveCustomValidator.php (modified) (2 diffs)
• framework/Web/UI/WebControls/TBaseValidator.php (modified) (7 diffs)
• tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page (modified) (1 diff)

trunk/HISTORY

@@ -11 +11 @@
 NEW: TFeedService, TRssFeedDocument (Knut, Qiang)
 NEW: TJsonService
+CHG: All validators ClientSide.OnSuccess becomes ClientSide.OnValidationSuccess, and OnSuccess event becomes OnValidationSuccess. (Wei)
+CHG: All validators ClientSide.OnError becomes ClientSide.OnValidationError, and OnError event becomes OnValidationError. (Wei)
+
 
 Version 3.0.5 October 8, 2006

trunk/UPGRADE

@@ -13 +13 @@
 version B between A and C, you need to following the instructions
 for both A and B.
+
+
+Upgrading from v3.0.x
+---------------------
+- Validators ClientSide.OnSuccess becomes ClientSide.OnValidationSuccess, 
+- Validators ClientSide.OnError becomes ClientSide.OnValidationError, 
+- Validator OnSuccess event becomes OnValidationSuccess. 
+- Validator OnError event becomes OnValidationError. 
+
 
 Upgrading from v3.0.4

trunk/framework/Web/Javascripts/js/compressed/validator.js

@@ -106 +106 @@
 this.isValid=this.evaluateIsValid();else
 this.isValid=true;if(this.isValid)
-{if(typeof(this.options.OnSuccess)=="function")
+{if(typeof(this.options.OnValidationSuccess)=="function")
 {if(this.requestDispatched==false)
-{this.refreshControlAndMessage();this.options.OnSuccess(this,invoker);}}
+{this.refreshControlAndMessage();this.options.OnValidationSuccess(this,invoker);}}
 else
 this.updateControl();}
 else
-{if(typeof(this.options.OnError)=="function")
+{if(typeof(this.options.OnValidationError)=="function")
 {if(this.requestDispatched==false)
-{this.refreshControlAndMessage();this.options.OnError(this,invoker)}}
+{this.refreshControlAndMessage();this.options.OnValidationError(this,invoker)}}
 else
 this.updateControl();}
@@ -190 +190 @@
 {this.validatingValue=value;request=new Prado.CallbackRequest(this.options.EventTarget,this.options);request.setCallbackParameter(value);request.setCausesValidation(false);request.options.onSuccess=this.callbackOnSuccess.bind(this);request.options.onFailure=this.callbackOnFailure.bind(this);request.dispatch();this.requestDispatched=true;return false;}
 return this.isValid;},callbackOnSuccess:function(request,data)
-{this.isValid=data;this.requestDispatched=false;Prado.Validation.validate(this.options.FormID,this.group,null);if(typeof(this.options.onSuccess)=="function")
-this.options.onSuccess(request,data);},callbackOnFailure:function(request,data)
+{this.isValid=data;this.requestDispatched=false;if(typeof(this.options.onSuccess)=="function")
+this.options.onSuccess(request,data);Prado.Validation.validate(this.options.FormID,this.group,null);},callbackOnFailure:function(request,data)
 {this.requestDispatched=false;if(typeof(this.options.onFailure)=="function")
 this.options.onFailure(request,data);}});Prado.WebUI.TRangeValidator=Class.extend(Prado.WebUI.TBaseValidator,{evaluateIsValid:function()

trunk/framework/Web/Javascripts/js/debug/validator.js

@@ -572 +572 @@
          * options['ControlCssClass']   Css class to use on the input upon error
          * options['OnValidate']                Function to call immediately after validation
-         * options['OnSuccess']                 Function to call upon after successful validation
-         * options['OnError']                   Function to call upon after error in validation.
+         * options['OnValidationSuccess']                       Function to call upon after successful validation
+         * options['OnValidationError']                 Function to call upon after error in validation.
          * options['ObserveChanges']    True to observe changes in input
          * </code>
@@ -686 +686 @@
                 if(this.isValid)
                 {
-                        if(typeof(this.options.OnSuccess) == "function")
+                        if(typeof(this.options.OnValidationSuccess) == "function")
                         {
                                 if(this.requestDispatched == false)
                                 {
                                         this.refreshControlAndMessage();
-                                        this.options.OnSuccess(this, invoker);
+                                        this.options.OnValidationSuccess(this, invoker);
                                 }
                         }
@@ -699 +699 @@
                 else
                 {
-                        if(typeof(this.options.OnError) == "function")
+                        if(typeof(this.options.OnValidationError) == "function")
                         {
                                 if(this.requestDispatched == false)
                                 {
                                         this.refreshControlAndMessage();
-                                        this.options.OnError(this, invoker)
+                                        this.options.OnValidationError(this, invoker)
                                 }
                         }
@@ -1144 +1144 @@
                 this.isValid = data;
                 this.requestDispatched = false;
-                Prado.Validation.validate(this.options.FormID, this.group,null);
                 if(typeof(this.options.onSuccess) == "function")
                         this.options.onSuccess(request,data);
+                Prado.Validation.validate(this.options.FormID, this.group,null);
         },
 

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

@@ -572 +572 @@
          * options['ControlCssClass']   Css class to use on the input upon error
          * options['OnValidate']                Function to call immediately after validation
-         * options['OnSuccess']                 Function to call upon after successful validation
-         * options['OnError']                   Function to call upon after error in validation.
+         * options['OnValidationSuccess']                       Function to call upon after successful validation
+         * options['OnValidationError']                 Function to call upon after error in validation.
          * options['ObserveChanges']    True to observe changes in input
          * </code>
@@ -686 +686 @@
                 if(this.isValid)
                 {
-                        if(typeof(this.options.OnSuccess) == "function")
+                        if(typeof(this.options.OnValidationSuccess) == "function")
                         {
                                 if(this.requestDispatched == false)
                                 {
                                         this.refreshControlAndMessage();
-                                        this.options.OnSuccess(this, invoker);
+                                        this.options.OnValidationSuccess(this, invoker);
                                 }
                         }
@@ -699 +699 @@
                 else
                 {
-                        if(typeof(this.options.OnError) == "function")
+                        if(typeof(this.options.OnValidationError) == "function")
                         {
                                 if(this.requestDispatched == false)
                                 {
                                         this.refreshControlAndMessage();
-                                        this.options.OnError(this, invoker)
+                                        this.options.OnValidationError(this, invoker)
                                 }
                         }
@@ -1144 +1144 @@
                 this.isValid = data;
                 this.requestDispatched = false;
-                Prado.Validation.validate(this.options.FormID, this.group,null);
                 if(typeof(this.options.onSuccess) == "function")
                         this.options.onSuccess(request,data);
+                Prado.Validation.validate(this.options.FormID, this.group,null);
         },
 

trunk/framework/Web/UI/ActiveControls/TActiveCustomValidator.php

@@ -172 +172 @@
 
         /**
+         * Client-side OnSuccess event is raise after validation is successfull.
+         * This will override the default client-side validator behaviour.
+         * @param string javascript code for client-side OnSuccess event.
+         */
+        public function setOnValidationSuccess($javascript)
+        {
+                $this->setFunction('OnValidationSuccess', $javascript);
+        }
+
+        /**
+         * @return string javascript code for client-side OnSuccess event.
+         */
+        public function getOnValidationSuccess()
+        {
+                return $this->getOption('OnValidationSuccess');
+        }
+
+        /**
          * Client-side OnError event is raised after validation failure.
          * This will override the default client-side validator behaviour.
          * @param string javascript code for client-side OnError event.
          */
-        public function setOnError($javascript)
-        {
-                $this->setFunction('OnError', $javascript);
+        public function setOnValidationError($javascript)
+        {
+                $this->setFunction('OnValidationError', $javascript);
         }
 
@@ -184 +202 @@
          * @return string javascript code for client-side OnError event.
          */
-        public function getOnError()
-        {
-                return $this->getOption('OnError');
+        public function getOnValidationError()
+        {
+                return $this->getOption('OnValidationError');
         }
 

trunk/framework/Web/UI/WebControls/TBaseValidator.php

@@ -491 +491 @@
                         {
                                 $this->setIsValid(true);
-                                $this->onSuccess();
+                                $this->onValidationSuccess();
                         }
                         else
                         {
                                 $this->setIsValid(false);
-                                $this->onError();
+                                $this->onValidationError();
                         }
                 }
@@ -528 +528 @@
          * This event is raised when the validator succeeds in validation.
          */
-        public function onSuccess()
-        {
-                $this->raiseEvent('OnSuccess',$this,null);
+        public function onValidationSuccess()
+        {
+                $this->raiseEvent('OnValidationSuccess',$this,null);
         }
 
@@ -536 +536 @@
          * This event is raised when the validator fails in validation.
          */
-        public function onError()
-        {
-                $this->raiseEvent('OnError',$this,null);
+        public function onValidationError()
+        {
+                $this->raiseEvent('OnValidationError',$this,null);
         }
 
@@ -617 +617 @@
         public function setOnSuccess($javascript)
         {
-                $this->setFunction('OnSuccess', $javascript);
+                $this->setFunction('OnValidationSuccess', $javascript);
         }
 
@@ -625 +625 @@
         public function getOnSuccess()
         {
-                return $this->getOption('OnSuccess');
+                return $this->getOption('OnValidationSuccess');
         }
 
@@ -635 +635 @@
         public function setOnError($javascript)
         {
-                $this->setFunction('OnError', $javascript);
+                $this->setFunction('OnValidationError', $javascript);
         }
 
@@ -643 +643 @@
         public function getOnError()
         {
-                return $this->getOption('OnError');
+                return $this->getOption('OnValidationError');
+        }
+
+
+        /**
+         * Alias for OnSuccess
+         * @param string javascript code for client-side OnSuccess event.
+         */
+        public function setOnValidationSuccess($javascript)
+        {
+                $this->setOnSuccess($javascript);
+        }
+
+        /**
+         * @return string javascript code for client-side OnSuccess event.
+         */
+        public function getOnValidationSuccess()
+        {
+                return $this->getOnSuccess();
+        }
+
+        /**
+         * Alias for OnError
+         * @param string javascript code for client-side OnError event.
+         */
+        public function setOnValidationError($javascript)
+        {
+                $this->setOnError($javascript);
+        }
+
+        /**
+         * @return string javascript code for client-side OnError event.
+         */
+        public function getOnValidationError()
+        {
+                return $this->getOnError();
         }
 

trunk/tests/FunctionalTests/active-controls/protected/pages/CallbackCustomValidatorTest.page

@@ -26 +26 @@
                 OnServerValidate="validate_text1">
                 <prop:ClientSide
-                        OnError="$('status').innerHTML='Error '+(new Date())"
-                        OnSuccess="$('status').innerHTML='Success '+(new Date())"
+                        OnValidationError="$('status').innerHTML='Error '+(new Date())"
+                        OnValidationSuccess="$('status').innerHTML='Success '+(new Date())"
                         OnLoading="Element.show('loader')"
                         OnComplete="Element.hide('loader')" />