Merge pull request #491 from pradosoft/jquery

Main development switch to Jquery

2 files changed, 9 insertions, 9 deletions

diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TActivePager/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/TActivePager/Home.page
index e38486d1..79a4f540 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/TActivePager/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TActivePager/Home.page
@@ -15,10 +15,10 @@ Go to page:
 	OnCallBack="RenderCallback"
 	>
 		<prop:ClientSide.OnLoading>
-			Element.show('wait')
+			jQuery('#wait').show()
 		</prop:ClientSide.OnLoading>
 		<prop:ClientSide.OnComplete>
-			Element.hide('wait')
+			jQuery('#wait').hide()
 		</prop:ClientSide.OnComplete>
 </com:TActivePager>
 <span id="wait" style="display: none;color: red">Please Wait...</span>
@@ -77,11 +77,11 @@ Total <%# $this->Parent->PageCount %> pages.
 	OnPageIndexChanged="pageChanged"
 	OnCallBack="RenderCallback"
 >
-<prop:ClientSide.OnLoading>
-			Element.show('wait')
+		<prop:ClientSide.OnLoading>
+			jQuery('#wait').show()
 		</prop:ClientSide.OnLoading>
 		<prop:ClientSide.OnComplete>
-			Element.hide('wait')
+			jQuery('#wait').hide()
 		</prop:ClientSide.OnComplete>
 </com:TActivePager>
 <br/>
@@ -92,11 +92,11 @@ Choose page:
 	OnPageIndexChanged="pageChanged"
 	OnCallBack="RenderCallback"
 >
-<prop:ClientSide.OnLoading>
-			Element.show('wait')
+		<prop:ClientSide.OnLoading>
+			jQuery('#wait').show()
 		</prop:ClientSide.OnLoading>
 		<prop:ClientSide.OnComplete>
-			Element.hide('wait')
+			jQuery('#wait').hide()
 		</prop:ClientSide.OnComplete>
 </com:TActivePager>
 <com:TJavascriptLogger/>
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page
index 04781438..6be81e96 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page
@@ -39,7 +39,7 @@ The third parameter is taken from the textbox;
   {

     var request = <%= $this->callback2->ActiveControl->Javascript %>;

     var param2 = 'value 2';

-    var param3 = $('<%= $this->txt1->ClientID %>').value;

+    var param3 = $('#<%= $this->txt1->ClientID %>').val();

     request.setCallbackParameter({'Param1':param1, 'Param2':param2, 'Param3':param3});

     request.dispatch();

   }