Fixed evaluation of end-scripts on callback

Aka: fix js event creation on callbacks

2 files changed, 22 insertions, 1 deletions

diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php
index 0f6fef1c..8cfbc9ba 100644
--- a/framework/Web/Javascripts/TJavaScript.php
+++ b/framework/Web/Javascripts/TJavaScript.php
@@ -60,6 +60,19 @@ class TJavaScript
 	}
 
 	/**
+	 * Renders a list of javascript code
+	 * @param array javascript blocks
+	 * @return string rendering result
+	 */
+	public static function renderScriptBlocksCallback($scripts)
+	{
+		if(count($scripts))
+			return implode("\n",$scripts)."\n";
+		else
+			return '';
+	}
+
+	/**
 	 * Renders javascript block
 	 * @param string javascript block
 	 * @return string rendering result
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);