diff options
Diffstat (limited to 'framework/Web/UI')
| -rw-r--r-- | framework/Web/UI/ActiveControls/TCallbackClientSide.php | 10 | ||||
| -rw-r--r-- | framework/Web/UI/TClientScriptManager.php | 6 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TDataGrid.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TDataGridPagerStyle.php | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TFont.php | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TListItem.php | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TPanelStyle.php | 4 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TStyle.php | 12 |
8 files changed, 21 insertions, 25 deletions
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientSide.php b/framework/Web/UI/ActiveControls/TCallbackClientSide.php index 113b35ce..4cb482ad 100644 --- a/framework/Web/UI/ActiveControls/TCallbackClientSide.php +++ b/framework/Web/UI/ActiveControls/TCallbackClientSide.php @@ -240,8 +240,7 @@ class TCallbackClientSide extends TClientSideOptions */ public function getHasPriority() { - $option = $this->getOption('HasPriority'); - return ($option===null) ? true : $option; + return true; } /** @@ -252,9 +251,8 @@ class TCallbackClientSide extends TClientSideOptions */ public function setHasPriority($value) { - $hasPriority = TPropertyValue::ensureBoolean($value); - $this->setOption('HasPriority', $hasPriority); - if(!$hasPriority) + // mimic the old behavior + if(!$value) $this->setEnablePageStateUpdate(false); } @@ -268,8 +266,6 @@ class TCallbackClientSide extends TClientSideOptions { $enabled = TPropertyValue::ensureBoolean($value); $this->setOption('EnablePageStateUpdate', $enabled); - if($enabled) - $this->setHasPriority(true); } /** diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php index 88e7bb62..5c4d9388 100644 --- a/framework/Web/UI/TClientScriptManager.php +++ b/framework/Web/UI/TClientScriptManager.php @@ -400,9 +400,9 @@ class TClientScriptManager extends TApplicationComponent public function getStyleSheetUrls() { $stylesheets = array_values( - array_map( - create_function('$e', 'return is_array($e) ? $e[0] : $e;'), - $this->_styleSheetFiles) + array_map(function($e) { + return is_array($e) ? $e[0] : $e; + }, $this->_styleSheetFiles) ); foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path=>$url) diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php index 9403fa45..2f338d22 100644 --- a/framework/Web/UI/WebControls/TDataGrid.php +++ b/framework/Web/UI/WebControls/TDataGrid.php @@ -1162,7 +1162,7 @@ class TDataGrid extends TBaseDataList implements INamingContainer $param=new TDataGridItemEventParameter($item); if($dataBind) { - $item->setDataItem($dataItem); + $item->setData($dataItem); $this->onItemCreated($param); $this->getControls()->add($item); $item->dataBind(); diff --git a/framework/Web/UI/WebControls/TDataGridPagerStyle.php b/framework/Web/UI/WebControls/TDataGridPagerStyle.php index c0e89edf..fc5b8480 100644 --- a/framework/Web/UI/WebControls/TDataGridPagerStyle.php +++ b/framework/Web/UI/WebControls/TDataGridPagerStyle.php @@ -38,9 +38,9 @@ class TDataGridPagerStyle extends TPanelStyle * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_mode===null) $exprops[] = "\0TDataGridPagerStyle\0_mode"; if ($this->_nextText===null) diff --git a/framework/Web/UI/WebControls/TFont.php b/framework/Web/UI/WebControls/TFont.php index 7c1246d1..432532b3 100644 --- a/framework/Web/UI/WebControls/TFont.php +++ b/framework/Web/UI/WebControls/TFont.php @@ -59,9 +59,9 @@ class TFont extends TComponent * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_flags===0) $exprops[] = "\0TFont\0_flags"; if ($this->_name==='') diff --git a/framework/Web/UI/WebControls/TListItem.php b/framework/Web/UI/WebControls/TListItem.php index fbfff80a..0118a917 100644 --- a/framework/Web/UI/WebControls/TListItem.php +++ b/framework/Web/UI/WebControls/TListItem.php @@ -67,9 +67,9 @@ class TListItem extends TComponent * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_attributes===null) $exprops[] = "\0TListItem\0_attributes"; if($this->_text==='') diff --git a/framework/Web/UI/WebControls/TPanelStyle.php b/framework/Web/UI/WebControls/TPanelStyle.php index a7ec88c3..8bb1354b 100644 --- a/framework/Web/UI/WebControls/TPanelStyle.php +++ b/framework/Web/UI/WebControls/TPanelStyle.php @@ -51,9 +51,9 @@ class TPanelStyle extends TStyle * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_backImageUrl===null) $exprops[] = "\0TPanelStyle\0_backImageUrl"; if ($this->_direction===null) diff --git a/framework/Web/UI/WebControls/TStyle.php b/framework/Web/UI/WebControls/TStyle.php index 3fec9b3d..f6d91e9b 100644 --- a/framework/Web/UI/WebControls/TStyle.php +++ b/framework/Web/UI/WebControls/TStyle.php @@ -52,9 +52,9 @@ class TStyle extends TComponent * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_fields===array()) $exprops[] = "\0TStyle\0_fields"; if($this->_font===null) @@ -489,9 +489,9 @@ class TTableStyle extends TStyle * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_backImageUrl===null) $exprops[] = "\0TTableStyle\0_backImageUrl"; if ($this->_horizontalAlign===null) @@ -740,9 +740,9 @@ class TTableItemStyle extends TStyle * Reimplement in derived classes to add new variables, but remember to also to call the parent * implementation first. */ - protected function __getZappableSleepProps(&$exprops) + protected function _getZappableSleepProps(&$exprops) { - parent::__getZappableSleepProps($exprops); + parent::_getZappableSleepProps($exprops); if ($this->_horizontalAlign===null) $exprops[] = "\0TTableItemStyle\0_horizontalAlign"; if ($this->_verticalAlign===null) |