Merge from 3.0 branch till 1150.

Fixed the bug that postback js causes controls not inheritable.

1 files changed, 10 insertions, 0 deletions

diff --git a/framework/Web/UI/WebControls/TEmailAddressValidator.php b/framework/Web/UI/WebControls/TEmailAddressValidator.php
index 3534d1d0..e1150233 100644
--- a/framework/Web/UI/WebControls/TEmailAddressValidator.php
+++ b/framework/Web/UI/WebControls/TEmailAddressValidator.php
@@ -36,6 +36,16 @@ class TEmailAddressValidator extends TRegularExpressionValidator
 	const EMAIL_REGEXP="\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*";

 

 	/**

+	 * Gets the name of the javascript class responsible for performing validation for this control.

+	 * This method overrides the parent implementation.

+	 * @return string the javascript class name

+	 */

+	protected function getClientClassName()

+	{

+		return 'Prado.WebUI.TEmailAddressValidator';

+	}

+

+	/**

 	 * @return string the regular expression that determines the pattern used to validate a field.

 	 */

 	public function getRegularExpression()