diff options
| author | Jean-Luc Gyger <jean-luc.gyger@vysual.ch> | 2016-02-11 10:01:12 +0100 |
|---|---|---|
| committer | Jean-Luc Gyger <jean-luc.gyger@vysual.ch> | 2016-02-11 10:01:12 +0100 |
| commit | d70861a8f9368773f2f0291454e9420174e6c14a (patch) | |
| tree | e44a32e401211422fb05da355c9eef4d5934d9e9 /framework/Web/UI/JuiControls/TJuiControlAdapter.php | |
| parent | d32f65815eb6feb4bcb8a0c85572f722d7826342 (diff) | |
| parent | 275f16b90a92c62935cb691d11e0bd124acf64e4 (diff) | |
Merge branch 'master' of https://github.com/majuca/prado
Diffstat (limited to 'framework/Web/UI/JuiControls/TJuiControlAdapter.php')
| -rw-r--r-- | framework/Web/UI/JuiControls/TJuiControlAdapter.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/Web/UI/JuiControls/TJuiControlAdapter.php b/framework/Web/UI/JuiControls/TJuiControlAdapter.php index 638f60f1..0550e3cd 100644 --- a/framework/Web/UI/JuiControls/TJuiControlAdapter.php +++ b/framework/Web/UI/JuiControls/TJuiControlAdapter.php @@ -3,9 +3,9 @@ * TJuiControlAdapter class file. * * @author Fabio Bas <ctrlaltca@gmail.com> - * @link http://www.pradosoft.com/ - * @copyright Copyright © 2013-2014 PradoSoft - * @license http://www.pradosoft.com/license/ + * @link https://github.com/pradosoft/prado + * @copyright Copyright © 2013-2015 PradoSoft + * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.Web.UI.JuiControls */ @@ -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; } @@ -292,7 +294,7 @@ class TJuiControlOptions * </code> * * @author Fabio Bas <ctrlaltca[at]gmail[dot]com> - * @license http://www.pradosoft.com/license + * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT * @package System.Web.UI.JuiControls */ class TJuiEventParameter extends TCallbackEventParameter |