php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 22:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #968: clientOptions should not be ignored when enabling internationalization.

Browse Source
This commit is contained in:
Qiang Xue
2013-10-12 20:52:41 -04:00
parent 2ae5c23d48
commit bc743a32b7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/jui/yii/jui/DatePicker.php
View File

@@ -9,6 +9,7 @@ namespace yii\jui;
use Yii; use Yii;
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Json;
/** /**
* DatePicker renders an datepicker jQuery UI widget. * DatePicker renders an datepicker jQuery UI widget.
@@ -61,11 +62,19 @@ class DatePicker extends InputWidget
public function run() public function run()
{ {
echo $this->renderWidget() . "\n"; echo $this->renderWidget() . "\n";
$this->registerWidget('datepicker', DatePickerAsset::className());
if ($this->language !== false) { if ($this->language !== false) {
$view = $this->getView(); $view = $this->getView();
DatePickerRegionalAsset::register($view); DatePickerRegionalAsset::register($view);
$view->registerJs("$('#{$this->options['id']}').datepicker('option', $.datepicker.regional['{$this->language}']);"); // do not pass in any options when creating the widget
// set the options later so that the options can be combined with regional options
$options = $this->clientOptions;
$this->clientOptions = array();
$this->registerWidget('datepicker', DatePickerAsset::className());
$this->clientOptions = $options;
$options = Json::encode($options);
$view->registerJs("$('#{$this->options['id']}').datepicker('option', $.extend({}, $.datepicker.regional['{$this->language}'], $options));");
} else {
$this->registerWidget('datepicker', DatePickerAsset::className());
} }
} }