diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2014-01-06 22:41:46 +0100 |
|---|---|---|
| committer | David <ottodavid@gmx.net> | 2014-08-21 17:20:54 +0200 |
| commit | fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (patch) | |
| tree | 80fff53aa0d9c60612bc2ca690a46194e9c160cf /framework/Web/UI/WebControls/TWebControl.php | |
| parent | 48577f63f414dc3078abc4bdc93bde932fe666a6 (diff) | |
Happy 2014!
(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae)
Conflicts:
framework/Data/Common/Mssql/TMssqlMetaData.php
framework/Data/Common/Mysql/TMysqlMetaData.php
framework/Data/Common/Oracle/TOracleMetaData.php
framework/Data/Common/Pgsql/TPgsqlMetaData.php
framework/Data/Common/Sqlite/TSqliteMetaData.php
framework/Data/Common/TDbMetaData.php
framework/Web/UI/ActiveControls/TCallbackClientScript.php
framework/Web/UI/JuiControls/TJuiAutoComplete.php
framework/Web/UI/JuiControls/TJuiControlAdapter.php
framework/Web/UI/JuiControls/TJuiDraggable.php
framework/Web/UI/JuiControls/TJuiDroppable.php
framework/Web/UI/JuiControls/TJuiResizable.php
framework/Web/UI/JuiControls/TJuiSelectable.php
framework/Web/UI/JuiControls/TJuiSortable.php
framework/Wsat/TWsatARGenerator.php
framework/Wsat/TWsatService.php
framework/Wsat/pages/TWsatGenerateAR.php
framework/Wsat/pages/TWsatHome.php
framework/Wsat/pages/TWsatLogin.php
framework/Wsat/pages/TWsatScaffolding.php
Diffstat (limited to 'framework/Web/UI/WebControls/TWebControl.php')
| -rw-r--r-- | framework/Web/UI/WebControls/TWebControl.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/framework/Web/UI/WebControls/TWebControl.php b/framework/Web/UI/WebControls/TWebControl.php index 0da4d88c..43e590fb 100644 --- a/framework/Web/UI/WebControls/TWebControl.php +++ b/framework/Web/UI/WebControls/TWebControl.php @@ -4,7 +4,7 @@ * * @author Qiang Xue <qiang.xue@gmail.com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TWebControl.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Web.UI.WebControls @@ -45,12 +45,12 @@ class TWebControl extends TControl implements IStyleable * @var boolean ensures the inclusion the id in the tag rendering. */ private $_ensureid=false; - + /** * @var TWebControlDecorator this render things before and after both the open and close tag */ protected $_decorator; - + /** * Subclasses can override getEnsureId or just set this property. eg. If your subclass @@ -80,7 +80,7 @@ class TWebControl extends TControl implements IStyleable $this->_decorator = Prado::createComponent('TWebControlDecorator', $this); return $this->_decorator; } - + /** * Copies basic control attributes from another control. * Properties including AccessKey, ToolTip, TabIndex, Enabled @@ -397,10 +397,10 @@ class TWebControl extends TControl implements IStyleable { $this->getStyle()->setWidth($value); } - + /** - * If your subclass overrides the onPreRender method be sure to call + * If your subclass overrides the onPreRender method be sure to call * this method through parent::onPreRender($param); so your sub-class can be decorated, * among other things. * @param TEventParameter event parameter to be passed to the event handlers @@ -408,7 +408,7 @@ class TWebControl extends TControl implements IStyleable public function onPreRender($param) { if($decorator = $this->getDecorator(false)) $decorator->instantiate(); - + parent::onPreRender($param); } @@ -494,7 +494,7 @@ class TWebControl extends TControl implements IStyleable $decorator->renderPostContentsText($writer); $writer->renderEndTag(); $decorator->renderPostTagText($writer); - } else + } else $writer->renderEndTag($writer); } } |