diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Web/Javascripts/source/prado/validator/validation3.js | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TBaseValidator.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js index b9c2e0af..5167f351 100644 --- a/framework/Web/Javascripts/source/prado/validator/validation3.js +++ b/framework/Web/Javascripts/source/prado/validator/validation3.js @@ -625,7 +625,7 @@ Prado.WebUI.TBaseValidator.prototype = this.visible = true;
if(this.message)
{
- if(this.options.Display == "Dynamic")
+ if(this.options.Display == "Dynamic")
{
var msg=this.message;
this.isValid ? setTimeout(function() { msg.hide(); }, 250) : msg.show();
@@ -684,7 +684,7 @@ Prado.WebUI.TBaseValidator.prototype = if(!this.control)
this.control = $(this.options.ControlToValidate);
- if(!this.control)
+ if(!this.control || this.control.disabled)
{
this.isValid = true;
return this.isValid;
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php index a755d605..96aefe63 100644 --- a/framework/Web/UI/WebControls/TBaseValidator.php +++ b/framework/Web/UI/WebControls/TBaseValidator.php @@ -485,7 +485,8 @@ abstract class TBaseValidator extends TLabel implements IValidator $this->onValidate(); if($this->getVisible(true) && $this->getEnabled(true)) { - if($this->getValidationTarget()) + // if the target is not a disabled web control + if(($target=$this->getValidationTarget())!==null && !($target instanceof TWebControl && !$target->getEnabled(true))) { if($this->evaluateIsValid()) { |