summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-10-24 19:16:20 +0200
committerFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:42:46 +0100
commitf34d86fc59349c9a8e7ecd3f6b571ea89f8d7295 (patch)
tree6dda4c90fa4a58b4f35eef7f67fe83bb2c723bec /framework/Web/UI
parentdd49f04ffd14333bdc6d0fed9faed7f67bb0441f (diff)
More ajax-related porting
Initial implementation of ajax error handling Fixed ajax modifications of select and checkboxes Partially ported TJavascriptLogger (used in tests)
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/ActiveControls/TCallbackClientScript.php5
-rw-r--r--framework/Web/UI/WebControls/TJavascriptLogger.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index 2c9a01b9..15300727 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -153,6 +153,11 @@ class TCallbackClientScript extends TApplicationComponent
'Value', 'Index', 'Clear', 'Indices', 'Values', 'All', 'Invert');
$type = ($type===null) ? $this->getSelectionControlType($control) : $type;
$total = $this->getSelectionControlIsListType($control) ? $control->getItemCount() : 1;
+
+ // pass the ID to avoid getting the surrounding elements (ISurroundable)
+ if($control instanceof TControl)
+ $control = $control->getClientID();
+
$this->callClientFunction('Prado.Element.select',
array($control, $type.$method, $value, $total));
}
diff --git a/framework/Web/UI/WebControls/TJavascriptLogger.php b/framework/Web/UI/WebControls/TJavascriptLogger.php
index a2f1c1c2..2af8bda6 100644
--- a/framework/Web/UI/WebControls/TJavascriptLogger.php
+++ b/framework/Web/UI/WebControls/TJavascriptLogger.php
@@ -70,7 +70,7 @@ class TJavascriptLogger extends TWebControl
{
$key = strtolower($this->getToggleKey());
$code = isset(self::$_keyCodes[$key]) ? self::$_keyCodes[$key] : 74;
- $js = "var logConsole; Event.OnLoad(function() { logConsole = new LogConsole($code)}); ";
+ $js = "var logConsole; jQuery(function() { logConsole = new LogConsole($code)}); ";
$cs = $this->getPage()->getClientScript();
$cs->registerBeginScript($this->getClientID(),$js);
$cs->registerPradoScript('logger');