diff options
Diffstat (limited to 'framework/Web/UI/JuiControls')
| -rw-r--r-- | framework/Web/UI/JuiControls/TJuiControlAdapter.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/JuiControls/TJuiDatePicker.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/framework/Web/UI/JuiControls/TJuiControlAdapter.php b/framework/Web/UI/JuiControls/TJuiControlAdapter.php index 638f60f1..6c326739 100644 --- a/framework/Web/UI/JuiControls/TJuiControlAdapter.php +++ b/framework/Web/UI/JuiControls/TJuiControlAdapter.php @@ -194,6 +194,8 @@ class TJuiControlOptions } elseif(is_numeric($value)) { // trick to get float or integer automatically when needed $this->_options[$option] = $value + 0; + } elseif(substr($low,0,8)=='function') { + $this->_options[$option] = new TJavaScriptLiteral($value); } else { $this->_options[$option] = $value; } diff --git a/framework/Web/UI/JuiControls/TJuiDatePicker.php b/framework/Web/UI/JuiControls/TJuiDatePicker.php index d894e07d..1f6e7619 100644 --- a/framework/Web/UI/JuiControls/TJuiDatePicker.php +++ b/framework/Web/UI/JuiControls/TJuiDatePicker.php @@ -93,7 +93,8 @@ class TJuiDatePicker extends TActiveTextBox implements INamingContainer, IJuiOpt 'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate', 'minDate', 'monthNames', 'monthNamesShort', 'navigationAsDateFormat', 'nextText', 'numberOfMonths', 'prevText', 'selectOtherMonths', 'shortYearCutoff', 'showAnim', 'showButtonPanel', 'showCurrentAtPos', 'showMonthAfterYear', - 'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix'); + 'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix', + 'beforeShow', 'beforeShowDay', 'onChangeMonthYear', 'onClose', 'onSelect'); } /** @@ -102,7 +103,7 @@ class TJuiDatePicker extends TActiveTextBox implements INamingContainer, IJuiOpt */ public function getValidEvents() { - return array('beforeShow', 'beforeShowDay', 'onChangeMonthYear', 'onClose', 'onSelect'); + return array(); } /** |