Merge from 3.0 branch till 1239.

2 files changed, 34 insertions, 0 deletions

diff --git a/tests/FunctionalTests/features/protected/pages/ClientScripTest.page b/tests/FunctionalTests/features/protected/pages/ClientScripTest.page
new file mode 100644
index 00000000..8dbf7133
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/ClientScripTest.page
@@ -0,0 +1,30 @@
+<com:TContent ID="Content">
+	<h1>ClientScript Test</h1>
+	
+	<com:TClientScript ScriptUrl=<%~ test.js %> ScriptPosition="Head">
+		if(typeof(ClientScriptInfo) == "undefined")
+			ClientScriptInfo = [];
+		ClientScriptInfo.push("ok 3?")
+	</com:TClientScript>
+		
+	<com:TClientScript ScriptPosition="Begin">
+		if(typeof(ClientScriptInfo) == "undefined")
+			ClientScriptInfo = [];
+		ClientScriptInfo.push("ok 2!")
+	</com:TClientScript>
+	
+	<com:TLabel ID="label1" Text="Label 1" />
+	<input type="button" id="button1" value="update" />
+	
+	<com:TClientScript ScriptPosition="End" UsingPradoScripts="prado">
+		Event.observe("button1", "click", function()
+		{
+			element = $("<%= $this->label1->ClientID %>");
+			if(element)
+				element.innerHTML = inspect(ClientScriptInfo);
+			else
+				alert("failed");
+		});
+	</com:TClientScript>
+	
+</com:TContent>
\ No newline at end of file
diff --git a/tests/FunctionalTests/features/protected/pages/test.js b/tests/FunctionalTests/features/protected/pages/test.js
new file mode 100644
index 00000000..e8e80b19
--- /dev/null
+++ b/tests/FunctionalTests/features/protected/pages/test.js
@@ -0,0 +1,4 @@
+if(typeof(ClientScriptInfo) == "undefined")
+	ClientScriptInfo = [];
+
+ClientScriptInfo.push("ok")
\ No newline at end of file