From 6801f262e4955fcb7fa48bc88ef64df786f0c650 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sun, 3 Nov 2013 19:33:34 +0100
Subject: Fixed evaluation of end-scripts on callback

Aka: fix js event creation on callbacks
---
 framework/Web/UI/ActiveControls/TCallbackClientScript.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'framework/Web/UI/ActiveControls/TCallbackClientScript.php')

diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
index a25e7f41..96c8d38e 100644
--- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php
+++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php
@@ -452,7 +452,16 @@ class TCallbackClientScript extends TApplicationComponent
 	 */
 	public function evaluateScript($writer)
 	{
-		$this->callClientFunction('Prado.Element.evaluateScript', array($writer));
+		if($writer instanceof THtmlWriter)
+		{
+			$boundary = $this->getResponseContentBoundary($writer);
+			$content = null;
+		} else {
+			$boundary = null;
+			$content = $writer;
+		}
+
+		$this->callClientFunction('Prado.Element.evaluateScript', array($content, $boundary));
 	}
 
 	/**
-- 
cgit v1.2.3