diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Web/Javascripts/prado/validation3.js | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TBaseValidator.php | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/framework/Web/Javascripts/prado/validation3.js b/framework/Web/Javascripts/prado/validation3.js index 8b6b19fc..396b4356 100644 --- a/framework/Web/Javascripts/prado/validation3.js +++ b/framework/Web/Javascripts/prado/validation3.js @@ -754,7 +754,9 @@ Prado.WebUI.TBaseValidator.prototype = return value;
},
- /**
+ /**
+ * The ControlType property comes from TBaseValidator::getClientControlClass()
+ * Be sure to update the TBaseValidator::$_clientClass if new cases are added.
* @return mixed control value to validate
*/
getValidationValue : function(control)
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php index 8fcba1c2..9ff2a97d 100644 --- a/framework/Web/UI/WebControls/TBaseValidator.php +++ b/framework/Web/UI/WebControls/TBaseValidator.php @@ -83,6 +83,12 @@ abstract class TBaseValidator extends TLabel implements IValidator * @var TValidatorClientScript validator client-script options. */ private $_clientScript; + /** + * Controls for which the client-side validation3.js file needs to handle + * them specially. + * @var array list of control class names + */ + private static $_clientClass = array('THtmlArea', 'TDatePicker'); /** * Constructor. @@ -152,7 +158,8 @@ abstract class TBaseValidator extends TLabel implements IValidator $options['ValidationGroup'] = $this->getValidationGroup(); $options['ControlToValidate'] = $control->getClientID(); $options['ControlCssClass'] = $this->getControlCssClass(); - $options['ControlType'] = get_class($control); + + $options['ControlType'] = $this->getClientControlClass($control); if(!is_null($this->_clientScript)) $options = array_merge($options,$this->_clientScript->getOptions()); @@ -161,6 +168,21 @@ abstract class TBaseValidator extends TLabel implements IValidator } /** + * Gets the Control type for client-side validation. If new cases exists in + * TBaseValidator::$_clientClass, be sure to update the corresponding + * "Javascript/validation3.js" file as well. + * @param TControl control to validate. + * @return string control type for client-side validation. + */ + private function getClientControlClass($control) + { + foreach(self::$_clientClass as $type) + if($control instanceof $type) + return $type; + return get_class($control); + } + + /** * Gets the TValidatorClientScript that allows modification of the client- * side validator events. * |