summaryrefslogtreecommitdiff
path: root/framework/Web/UI/ActiveControls
diff options
context:
space:
mode:
Diffstat (limited to 'framework/Web/UI/ActiveControls')
-rw-r--r--framework/Web/UI/ActiveControls/TActiveControlAdapter.php2
-rwxr-xr-xframework/Web/UI/ActiveControls/TActiveFileUpload.php2
-rwxr-xr-xframework/Web/UI/ActiveControls/TDraggable.php10
-rwxr-xr-xframework/Web/UI/ActiveControls/TDropContainer.php2
4 files changed, 8 insertions, 8 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
index 3e6747b3..a2e5d0ce 100644
--- a/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
+++ b/framework/Web/UI/ActiveControls/TActiveControlAdapter.php
@@ -81,7 +81,6 @@ class TActiveControlAdapter extends TControlAdapter
public function onPreRender($param)
{
parent::onPreRender($param);
- $this->getPage()->getClientScript()->registerPradoScript('ajax');
}
/**
@@ -89,6 +88,7 @@ class TActiveControlAdapter extends TControlAdapter
*/
public function render($writer)
{
+ $this->getPage()->getClientScript()->registerPradoScript('ajax');
$this->renderCallbackClientScripts();
if($this->_control->getVisible(false))
{
diff --git a/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
index b4557cd8..ca924026 100755
--- a/framework/Web/UI/ActiveControls/TActiveFileUpload.php
+++ b/framework/Web/UI/ActiveControls/TActiveFileUpload.php
@@ -270,7 +270,6 @@ EOS;
public function onPreRender($param)
{
parent::onPreRender($param);
- $this->getPage()->getClientScript()->registerPradoScript('activefileupload');
if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId'] == $this->getClientID())
{
@@ -369,6 +368,7 @@ EOS;
parent::addAttributesToRender($writer);
$writer->addAttribute('id',$this->getClientID());
+ $this->getPage()->getClientScript()->registerPradoScript('activefileupload');
$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(),$this->getClientOptions());
}
diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php
index 10ecf5a5..fccc9328 100755
--- a/framework/Web/UI/ActiveControls/TDraggable.php
+++ b/framework/Web/UI/ActiveControls/TDraggable.php
@@ -145,11 +145,6 @@ class TDraggable extends TPanel
public function onPreRender($param)
{
parent::onPreRender($param);
- $cs=$this->getPage()->getClientScript();
- if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting)
- $cs->registerPradoScript('dragdropextra');
- else
- $cs->registerPradoScript('dragdrop');
}
/**
@@ -159,7 +154,12 @@ class TDraggable extends TPanel
protected function addAttributesToRender($writer)
{
parent::addAttributesToRender($writer);
+
$cs=$this->getPage()->getClientScript();
+ if ($this->getGhosting()==TDraggableGhostingOptions::SuperGhosting)
+ $cs->registerPradoScript('dragdropextra');
+ else
+ $cs->registerPradoScript('dragdrop');
$writer->addAttribute('id',$this->getClientID());
$options=TJavascript::encode($this->getPostBackOptions());
$class=$this->getClientClassName();
diff --git a/framework/Web/UI/ActiveControls/TDropContainer.php b/framework/Web/UI/ActiveControls/TDropContainer.php
index daa8469b..072762df 100755
--- a/framework/Web/UI/ActiveControls/TDropContainer.php
+++ b/framework/Web/UI/ActiveControls/TDropContainer.php
@@ -181,7 +181,6 @@ class TDropContainer extends TPanel implements IActiveControl, ICallbackEventHan
public function onPreRender($param)
{
parent::onPreRender($param);
- $this->getPage()->getClientScript()->registerPradoScript('dragdrop');
}
/**
@@ -193,6 +192,7 @@ class TDropContainer extends TPanel implements IActiveControl, ICallbackEventHan
parent::addAttributesToRender($writer);
$writer->addAttribute('id',$this->getClientID());
+ $this->getPage()->getClientScript()->registerPradoScript('dragdrop');
$this->getActiveControl()->registerCallbackClientScript(
$this->getClientClassName(), $this->getPostBackOptions());
}