Merge branch 'jquery' of https://github.com/pradosoft/prado into jquery

2 files changed, 3 insertions, 5 deletions

diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index b5ed8a86..275fc557 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -428,7 +428,7 @@ class TDatePicker extends TTextBox
 			$this->renderDropDownListCalendar($writer);
 			if($this->hasDayPattern())
 			{
-				$this->registerCalendarClientScriptPost();
+				$this->renderClientControlScript($writer);
 				$this->renderDatePickerButtons($writer);
 			}
 		}
@@ -850,10 +850,8 @@ class TDatePicker extends TTextBox
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id',$this->getClientID());
-		$this->registerCalendarClientScriptPost();
 	}
 
-
 	/**
 	 * Registers the javascript code to initialize the date picker.
 	 */
@@ -866,7 +864,7 @@ class TDatePicker extends TTextBox
 		}
 	}
 
-	protected function registerCalendarClientScriptPost()
+	protected function renderClientControlScript($writer)
 	{
 		if($this->getShowCalendar())
 		{
diff --git a/framework/Web/UI/WebControls/TSlider.php b/framework/Web/UI/WebControls/TSlider.php
index dcf34bfc..a07c995f 100644
--- a/framework/Web/UI/WebControls/TSlider.php
+++ b/framework/Web/UI/WebControls/TSlider.php
@@ -457,7 +457,7 @@ class TSlider extends TWebControl implements IPostBackDataHandler, IDataRenderer
 		$options['axis'] = strtolower($this->getDirection());
 		$options['maximum'] = $maxValue;
 		$options['minimum'] = $minValue;
-		$options['range'] = TJavascript::quoteJsLiteral('$R('.$minValue.",".$maxValue.")");
+		$options['range'] = array($minValue, $maxValue);
 		$options['sliderValue'] = $this->getValue();
 		$options['disabled'] = !$this->getEnabled();
 		$values=$this->getValues();