diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2013-11-03 19:33:34 +0100 | 
|---|---|---|
| committer | Fabio Bas <ctrlaltca@gmail.com> | 2013-11-26 11:42:49 +0100 | 
| commit | 8f389748d555b39d139bc0852e35f2541f4e2cb5 (patch) | |
| tree | 461e6acbf7170540777c1522c3cdfd8b3168ae33 /framework/Web/UI/ActiveControls/TCallbackClientScript.php | |
| parent | 36f481b48d9777963d063e227a10882d318dc8d8 (diff) | |
Fixed evaluation of end-scripts on callback
Aka: fix js event creation on callbacks
Diffstat (limited to 'framework/Web/UI/ActiveControls/TCallbackClientScript.php')
| -rw-r--r-- | framework/Web/UI/ActiveControls/TCallbackClientScript.php | 11 | 
1 files changed, 10 insertions, 1 deletions
| 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));  	}  	/** | 
