summaryrefslogtreecommitdiff
path: root/tests/FunctionalTests/features
diff options
context:
space:
mode:
authorxue <>2006-07-04 23:25:41 +0000
committerxue <>2006-07-04 23:25:41 +0000
commit9cc6b7fffd31f4b9ee9aceef9224c84dcf28aeb8 (patch)
treed3d6d907278b06feef3fc77c14d2231cfbff1125 /tests/FunctionalTests/features
parent2cf86eb80ae66da86eb2e37f0f99b2035241d3ae (diff)
Merge from 3.0 branch till 1239.
Diffstat (limited to 'tests/FunctionalTests/features')
-rw-r--r--tests/FunctionalTests/features/protected/pages/ClientScripTest.page30
-rw-r--r--tests/FunctionalTests/features/protected/pages/test.js4
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