Merge pull request #491 from pradosoft/jquery

Main development switch to Jquery

2 files changed, 10 insertions, 5 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TClientSideValidator/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TClientSideValidator/Home.page
index 06ed6295..f7d03ea2 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/TClientSideValidator/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TClientSideValidator/Home.page
@@ -1,6 +1,11 @@
 <com:TContent ID="body">

 <h1>Conditional Validation (client-side + server side)</h1>

 

+<com:TStyleSheet>

+.required {

+	background-color: #E77471;

+}

+</com:TStyleSheet>

 <table class="sampletable">

 <tr>

 <td class="samplenote">

@@ -22,7 +27,7 @@ Check "optional" to validate both textboxes
 			ErrorMessage="*"

 			ControlCssClass="required">

 		<prop:ClientSide.OnValidate>

-			sender.enabled = $('<%= $this->check1->ClientID %>').checked;

+			sender.enabled = jQuery('#<%= $this->check1->ClientID %>').get(0).checked;

 		</prop:ClientSide.OnValidate>

 

 		</com:TRequiredFieldValidator>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TSlider/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TSlider/Home.page
index bfbbe8e3..6c79fae4 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/TSlider/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TSlider/Home.page
@@ -16,7 +16,7 @@ Horizontal slider from -50 to 50,  Javascript 'onSlide' handler, ServerSide 'onS
 </td><td class="sampleaction">
 <com:TSlider id="slider2" AutoPostBack="true"  Direction="Horizontal" Value="0" Enabled="true" MinValue="-50" MaxValue="50" OnValueChanged="slider2Changed">
 	<prop:ClientSide.onSlide>
-		$('slider2value').innerHTML = value;
+		$('#slider2value').get(0).innerHTML = value;
 	</prop:ClientSide.onSlide>
 </com:TSlider>
 Value  : <span id="slider2value"><%=$this->slider2->value%></span>
@@ -28,14 +28,14 @@ Vertical slider from 0 to 1, Javascript 'onSlide' handler, ServerSide 'onSliderC
 </td><td class="sampleaction">
 <com:TSlider id="slider3" AutoPostBack="false" Direction="Vertical" Enabled="true" MinValue="0" MaxValue="1" StepSize="0.1" OnValueChanged="slider3Changed">
 	<prop:ClientSide.onSlide>
-		$('slider3value').innerHTML = value;
+		$('#slider3value').get(0).innerHTML = value;
 	</prop:ClientSide.onSlide>
 </com:TSlider>
 Value  : <span id="slider3value"><%=$this->slider3->value%></span>
 </td><td class="sampleaction">
 <com:TButton Text="Submit"/>
 <com:TLabel id="slider3Result"/>
-</td></tr>

-</table>

+</td></tr>
+</table>
 
 </com:TContent>
\ No newline at end of file