From 38a149c8079964b09b1a259a311a6afddec4f046 Mon Sep 17 00:00:00 2001
From: "godzilla80@gmx.net" <>
Date: Sun, 8 Nov 2009 08:05:18 +0000
Subject: Always render clientside counterparts of validation control even if
 not enabled, but pass-through Enabled property, to allow Enabled/Disable of
 validator on callback.

---
 framework/Web/Javascripts/source/prado/validator/validation3.js | 3 ++-
 framework/Web/UI/WebControls/TBaseValidator.php                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'framework/Web')

diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js
index 18b1d0c2..4e799677 100644
--- a/framework/Web/Javascripts/source/prado/validator/validation3.js
+++ b/framework/Web/Javascripts/source/prado/validator/validation3.js
@@ -795,7 +795,7 @@ Prado.WebUI.TBaseValidator.prototype =
 		 * Wether the validator is enabled (default true)
 		 * @var {boolean} enabled
 		 */
-		this.enabled = true;
+		this.enabled = options.Enabled;
 		/**
 		 * Visibility state of validator(default false)
 		 * @var {boolean} visible
@@ -837,6 +837,7 @@ Prado.WebUI.TBaseValidator.prototype =
 		 * @var {element} message
 		 */
 		this.message = $(options.ID);
+
 		Prado.Registry.set(options.ID, this);
 		if(this.control && this.message)
 		{
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 6daae4d0..0c71f46d 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -167,6 +167,7 @@ abstract class TBaseValidator extends TLabel implements IValidator
 		$options['ControlCssClass'] = $this->getControlCssClass();
 
 		$options['ControlType'] = $this->getClientControlClass($control);
+		$options['Enabled'] = $this->getEnabled(true);
 
 		//get date format from date picker target control
 		if($control instanceof TDatePicker)
@@ -241,7 +242,7 @@ abstract class TBaseValidator extends TLabel implements IValidator
 			$scripts->registerPradoScript('validator');
 			$scripts->registerEndScript($scriptKey, "new Prado.ValidationManager({$options});");
 		}
-		if($this->getEnableClientScript() & $this->getEnabled(true))
+		if($this->getEnableClientScript())
 			$this->registerClientScriptValidator();
 	}
 
-- 
cgit v1.2.3