From c7ab73d6448aad8aa630878fc83298b762505194 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 6 Mar 2016 18:26:31 +0100 Subject: Revert part of #553; fix #574 --- .../pages/ActiveControls/Samples/TActiveCustomValidator/Home.page | 3 ++- .../pages/ActiveControls/Samples/TActiveCustomValidator/Home.php | 8 ++++++++ framework/Web/Javascripts/source/prado/validator/validation3.js | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.page index 1d16235e..33811167 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.page +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.page @@ -12,7 +12,8 @@ Custom validator using callbacks: ControlToValidate="textbox1" ErrorMessage="Please enter 'Prado'" OnServerValidate="validator1_onvalidate" /> - + + diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.php index 916432ca..b8d4e28a 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.php +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCustomValidator/Home.php @@ -6,5 +6,13 @@ class Home extends TPage { $param->IsValid = $this->textbox1->Text == 'Prado'; } + + public function button1_oncallback($sender, $param) + { + if($this->IsValid) + $this->label1->Text='Callback success'; + else + $this->label1->Text='Validation failed'; + } } diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js index 98be95d7..24466599 100644 --- a/framework/Web/Javascripts/source/prado/validator/validation3.js +++ b/framework/Web/Javascripts/source/prado/validator/validation3.js @@ -1603,7 +1603,7 @@ Prado.WebUI.TActiveCustomValidator = jQuery.klass(Prado.WebUI.TBaseValidator, this.options.OnValidate(this, invoker); } - return this.isValid; + return true; }, /** -- cgit v1.2.3