2 files changed, 14 insertions, 20 deletions
diff --git a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
index a7875c0d..7551336d 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/NestedActiveControls.page
@@ -14,14 +14,12 @@
 		Click Me!
 	</div>
 	<com:TActiveLabel ID="label2" Text="Label 2" />
-	<script type="text/javascript">
-		Event.OnLoad(function()
-		{
-			Event.observe($("div1"), "click", function()
-			{
-				Prado.Callback("<%= $this->callback1->UniqueID %>")
-			})
-		})
-	</script>
+	<com:TClientScript>
+		jQuery( document ).ready(function() {
+			jQuery("#div1").click(function() {
+				Prado.Callback("<%= $this->callback1->UniqueID %>");
+			});
+		});
+	</com:TClientScript>
 
 </com:TForm>
diff --git a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
index 885b368f..9ae1dca2 100755
--- a/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
+++ b/tests/FunctionalTests/active-controls/protected/pages/PostLoadingTest.page
@@ -8,15 +8,11 @@
 	<div id="div1" style="border:1px solid #666; background-color: #ffe; text-align: center; padding:3em">
 		Click Me!
 	</div>
-
-	<script type="text/javascript">
-		Event.OnLoad(function()
-		{
-			Event.observe($("div1"), "click", function()
-			{
-				Prado.Callback("<%= $this->callback1->UniqueID %>")
-			})
-		})
-	</script>
-
+	<com:TClientScript>
+		jQuery( document ).ready(function() {
+			jQuery("#div1").click(function() {
+				Prado.Callback("<%= $this->callback1->UniqueID %>");
+			});
+		});
+	</com:TClientScript>
 </com:TForm>
 \ No newline at end of file