diff options
author | ctrlaltca@gmail.com <> | 2011-06-25 09:08:40 +0000 |
---|---|---|
committer | ctrlaltca@gmail.com <> | 2011-06-25 09:08:40 +0000 |
commit | cda44920115f2aadd7c3fbe2df13cb48a2cbc0c5 (patch) | |
tree | b367d872dcf3cec40497f4d6755ce7bb47312058 /framework/Web/UI/ActiveControls | |
parent | 87e7366d4d9d3de79772b851f8772a4011d6227d (diff) |
applied further "progressive rendering" patches (#235)
added TFlushOutput component
fixed THtmlarea quickstart demo
Diffstat (limited to 'framework/Web/UI/ActiveControls')
-rwxr-xr-x | framework/Web/UI/ActiveControls/TActiveDatePicker.php | 8 | ||||
-rwxr-xr-x | framework/Web/UI/ActiveControls/TActiveFileUpload.php | 4 | ||||
-rwxr-xr-x | framework/Web/UI/ActiveControls/TDraggable.php | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveDatePicker.php b/framework/Web/UI/ActiveControls/TActiveDatePicker.php index 3d803664..38796a5e 100755 --- a/framework/Web/UI/ActiveControls/TActiveDatePicker.php +++ b/framework/Web/UI/ActiveControls/TActiveDatePicker.php @@ -107,12 +107,16 @@ class TActiveDatePicker extends TDatePicker implements ICallbackEventHandler, I /** * Registers the javascript code to initialize the date picker. */ - protected function registerCalendarClientScript() + + protected function registerCalendarClientScriptPre() { - $cs = $this->getPage()->getClientScript(); $cs->registerPradoScript("activedatepicker"); + } + protected function registerCalendarClientScriptPost() + { + $cs = $this->getPage()->getClientScript(); if(!$cs->isEndScriptRegistered('TDatePicker.spacer')) { $spacer = $this->getAssetUrl('spacer.gif'); diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php index 7820312d..1eaad5d9 100755 --- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php +++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php @@ -204,9 +204,9 @@ EOS; /** * Publish the javascript */ - public function onPreRender($param){ + public function onPreRender($param) + { parent::onPreRender($param); - $this->getPage()->getClientScript()->registerPradoScript('effects'); $this->getPage()->getClientScript()->registerPradoScript('activefileupload'); if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId'] == $this->getClientID()) diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php index 10e78b9b..10ecf5a5 100755 --- a/framework/Web/UI/ActiveControls/TDraggable.php +++ b/framework/Web/UI/ActiveControls/TDraggable.php @@ -145,6 +145,7 @@ class TDraggable extends TPanel public function onPreRender($param) { parent::onPreRender($param); + $cs=$this->getPage()->getClientScript(); if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting) $cs->registerPradoScript('dragdropextra'); else @@ -158,6 +159,7 @@ class TDraggable extends TPanel protected function addAttributesToRender($writer) { parent::addAttributesToRender($writer); + $cs=$this->getPage()->getClientScript(); $writer->addAttribute('id',$this->getClientID()); $options=TJavascript::encode($this->getPostBackOptions()); $class=$this->getClientClassName(); |