summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/source
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2013-11-03 19:33:34 +0100
committerFabio Bas <ctrlaltca@gmail.com>2013-11-26 11:42:49 +0100
commit8f389748d555b39d139bc0852e35f2541f4e2cb5 (patch)
tree461e6acbf7170540777c1522c3cdfd8b3168ae33 /framework/Web/Javascripts/source
parent36f481b48d9777963d063e227a10882d318dc8d8 (diff)
Fixed evaluation of end-scripts on callback
Aka: fix js event creation on callbacks
Diffstat (limited to 'framework/Web/Javascripts/source')
-rw-r--r--framework/Web/Javascripts/source/prado/prado.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index 7c3308c8..13e8be92 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -524,9 +524,17 @@ Prado.Element =
* Evaluate a javascript snippet from a string.
* @function ?
* @param {string} content - String containing the script
+ * @param {string} boundary - Boundary containing the script
*/
- evaluateScript : function(content)
+ evaluateScript : function(content, boundary)
{
+ if(boundary)
+ {
+ var result = this.extractContent(boundary);
+ if(result != null)
+ content = result;
+ }
+
try
{
jQuery.globalEval(content);