summaryrefslogtreecommitdiff
path: root/lib/prado/framework/Web/UI/JuiControls
diff options
context:
space:
mode:
Diffstat (limited to 'lib/prado/framework/Web/UI/JuiControls')
-rw-r--r--lib/prado/framework/Web/UI/JuiControls/TJuiAutoComplete.php4
-rw-r--r--lib/prado/framework/Web/UI/JuiControls/TJuiControlOptions.php2
-rw-r--r--lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiAutoComplete.php b/lib/prado/framework/Web/UI/JuiControls/TJuiAutoComplete.php
index be6b1b4..612d89d 100644
--- a/lib/prado/framework/Web/UI/JuiControls/TJuiAutoComplete.php
+++ b/lib/prado/framework/Web/UI/JuiControls/TJuiAutoComplete.php
@@ -4,7 +4,7 @@
*
* @author Wei Zhuo <weizhuo[at]gamil[dot]com>
* @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
+ * @copyright Copyright &copy; 2005-2016 The PRADO Group
* @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
* @package System.Web.UI.ActiveControls
*/
@@ -364,7 +364,7 @@ class TJuiAutoComplete extends TActiveTextBox implements INamingContainer, IJuiO
*/
public function renderSuggestions($writer)
{
- if($this->getActiveControl()->canUpdateClientSide())
+ if($this->getActiveControl()->canUpdateClientSide(true))
{
$data=array();
$items=$this->getSuggestions()->getItems();
diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiControlOptions.php b/lib/prado/framework/Web/UI/JuiControls/TJuiControlOptions.php
index 64cf710..8b0cc84 100644
--- a/lib/prado/framework/Web/UI/JuiControls/TJuiControlOptions.php
+++ b/lib/prado/framework/Web/UI/JuiControls/TJuiControlOptions.php
@@ -112,7 +112,7 @@ class TJuiControlOptions
}
}
- throw new THttpException(500,'juioptions_option_invalid',$this->_control->ID, $name);
+ throw new TConfigurationException('juioptions_option_invalid',$this->_control->ID, $name);
}
/**
diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php
index e02157d..cd349f1 100644
--- a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php
+++ b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php
@@ -161,7 +161,7 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand
private function triggerClientMethod($method)
{
$cs = $this->getPage()->getClientScript();
- $code = "jQuery('#".$this->getClientId()."').dialog('".$method."');";
+ $code = "jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
}