diff options
Diffstat (limited to 'tests/FunctionalTests/active-controls/protected/pages')
| -rwxr-xr-x | tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page | 12 | ||||
| -rwxr-xr-x | tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page index 7ab4bab9..13133a32 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/ActivePanelTest.page @@ -10,13 +10,11 @@ Click Me! </div> <script type="text/javascript"> - Event.OnLoad(function() - { - Event.observe($("div1"), "click", function() - { - Prado.Callback("<%= $this->callback1->UniqueID %>") - }) - }) + jQuery( document ).ready(function() { + jQuery("#div1").click(function() { + Prado.Callback("<%= $this->callback1->UniqueID %>"); + }); + }); </script> <com:TJavascriptLogger /> </com:TForm>
\ No newline at end of file diff --git a/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page b/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page index 3cecbade..975def5c 100755 --- a/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page +++ b/tests/FunctionalTests/active-controls/protected/pages/CallbackOptionsTest.page @@ -3,25 +3,25 @@ <com:TCallbackOptions ID="options1"> <prop:ClientSide.OnLoading> - $("status").show(); + $("#status").show(); </prop:ClientSide.OnLoading> <prop:ClientSide.OnComplete> - $("status").hide(); + $("#status").hide(); </prop:ClientSide.OnComplete> <prop:ClientSide.OnSuccess> - Element.update("label1", "Button 1 has returned"); + $("#label1").html("Button 1 has returned"); </prop:ClientSide.OnSuccess> </com:TCallbackOptions> <com:TActiveButton id="button1" Text="Button 1" ActiveControl.CallbackOptions="options1" /> <com:TActiveButton id="button2" Text="Button 2" ActiveControl.CallbackOptions="options1"> <prop:ClientSide.OnSuccess> - Element.update("label2", "Button 2 has returned"); + $("#label2").html("Button 2 has returned"); </prop:ClientSide.OnSuccess> </com:TActiveButton> <com:TActiveButton id="button3" Text="Button 3"> <prop:ClientSide.OnSuccess> - Element.update("label3", "Button 3 has returned"); + $("#label3").html("Button 3 has returned"); </prop:ClientSide.OnSuccess> </com:TActiveButton> |