Update to release v1.3.5 fix #63, fix #64

Author: kartik-v

CHANGE.md

@@ -1,6 +1,13 @@
 Change Log: `yii2-widget-datepicker`
 ====================================
 
+## version 1.3.5
+
+**Date:** 28-Dec-2015
+
+- (bug #63): Fix extra brace bug in plugin JS code.
+- (enh #64): Enhance and improve language & locale validation.
+
 ## version 1.3.4
 
 **Date:** 27-Dec-2015

DatePicker.php

@@ -4,7 +4,7 @@
  * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015
  * @package yii2-widgets
  * @subpackage yii2-widget-datepicker
- * @version 1.3.4
+ * @version 1.3.5
  */
 
 namespace kartik\date;
@@ -86,25 +86,25 @@ class DatePicker extends InputWidget
     /**
      * @var mixed the calendar picker button configuration.
      * - if this is passed as a string, it will be displayed as is (will not be HTML encoded).
-     * - if this is set to false, the picker button will not be displayed.
-     * - if this is passed as an array (this is the DEFAULT) it will treat this as HTML attributes
-     *   for the button (to be displayed as a Bootstrap addon). The following special keys are recognized;
-     *   - icon - string, the bootstrap glyphicon name/suffix. Defaults to 'calendar'.
-     *   - title - string|bool, the title to be displayed on hover. Defaults to 'Select date & time'. To disable,
-     *     set it to `false`.
+     * - if this is set to `false`, the picker button will not be displayed.
+     * - if this is passed as an array (this is the DEFAULT) it will treat this as HTML attributes for the button (to
+     *     be displayed as a Bootstrap addon). The following special keys are recognized;
+     *   - icon: string, the bootstrap glyphicon name/suffix. Defaults to 'calendar'.
+     *   - title: string|bool, the title to be displayed on hover. Defaults to 'Select date & time'. To disable, set it
+     *     to `false`.
      */
     public $pickerButton = [];
 
     /**
      * @var mixed the calendar remove button configuration - applicable only for type set to
      *     `DatePicker::TYPE_COMPONENT_PREPEND` or `DatePicker::TYPE_COMPONENT_APPEND`.
      * - if this is passed as a string, it will be displayed as is (will not be HTML encoded).
-     * - if this is set to false, the remove button will not be displayed.
-     * - if this is passed as an array (this is the DEFAULT) it will treat this as HTML attributes
-     *   for the button (to be displayed as a Bootstrap addon). The following special keys are recognized;
+     * - if this is set to `false`, the remove button will not be displayed.
+     * - if this is passed as an array (this is the DEFAULT) it will treat this as HTML attributes for the button (to
+     *     be displayed as a Bootstrap addon). The following special keys are recognized;
      *   - icon - string, the bootstrap glyphicon name/suffix. Defaults to 'remove'.
-     *   - title - string, the title to be displayed on hover. Defaults to 'Clear field'. To disable,
-     *     set it to `false`.
+     *   - title - string, the title to be displayed on hover. Defaults to 'Clear field'. To disable, set it to
+     *     `false`.
      */
     public $removeButton = [];
 
@@ -178,16 +178,17 @@ protected function renderDatePicker()
             $this->_container['data-date'] = $this->value;
         }
         if (empty($this->layout)) {
-            if ($this->type == self::TYPE_COMPONENT_PREPEND) {
+            if ($this->type === self::TYPE_COMPONENT_PREPEND) {
                 $this->layout = '{picker}{remove}{input}';
-            } elseif ($this->type == self::TYPE_COMPONENT_APPEND) {
+            } elseif ($this->type === self::TYPE_COMPONENT_APPEND) {
                 $this->layout = '{input}{remove}{picker}';
-            } elseif ($this->type == self::TYPE_RANGE) {
+            } elseif ($this->type === self::TYPE_RANGE) {
                 $this->layout = '{input1}{separator}{input2}';
             }
         }
         Html::addCssClass($this->options, 'krajee-datepicker');
-        $this->options['data-datepicker-source'] = $this->type == self::TYPE_INPUT ? $this->options['id'] : $this->_container['id'];
+        $this->options['data-datepicker-source'] = $this->type === self::TYPE_INPUT ? $this->options['id'] :
+            $this->_container['id'];
         $this->options['data-datepicker-type'] = $this->type;
         $this->registerAssets();
         echo $this->renderInput();
@@ -213,14 +214,14 @@ protected static function err($msg = '')
     protected function validateConfig()
     {
         if ($this->type < 1 || $this->type > 6 || !is_int($this->type)) {
-            self::err("Invalid value for the property 'type'. Must be an integer between 1 and 6.");
+            static::err("Invalid value for the property 'type'. Must be an integer between 1 and 6.");
         }
         if ($this->type === self::TYPE_RANGE) {
             if ($this->attribute2 === null && $this->name2 === null) {
-                self::err("Either 'name2' or 'attribute2' properties must be specified for a datepicker 'range' markup.");
+                static::err("Either 'name2' or 'attribute2' properties must be specified for a datepicker 'range' markup.");
             }
-            if (!class_exists('\\kartik\\field\\FieldRangeAsset')) {
-                self::err(
+            if (!class_exists("\\kartik\\field\\FieldRangeAsset")) {
+                static::err(
                     "The yii2-field-range extension is not installed and is a pre-requisite for a DatePicker " .
                     "RANGE type. To install this extension run this command on your console: \n\n" .
                     "php composer.phar require kartik-v/yii2-field-range \"*\""
@@ -231,13 +232,13 @@ protected function validateConfig()
             return;
         }
         if (!$this->form instanceof ActiveForm) {
-            self::err("The 'form' property must be of type \\yii\\widgets\\ActiveForm");
+            static::err("The 'form' property must be of type \\yii\\widgets\\ActiveForm");
         }
         if (!$this->hasModel()) {
-            self::err("You must set the 'model' and 'attribute' properties when the 'form' property is set.");
+            static::err("You must set the 'model' and 'attribute' properties when the 'form' property is set.");
         }
         if ($this->type === self::TYPE_RANGE && !isset($this->attribute2)) {
-            self::err("The 'attribute2' property must be set for a 'range' type markup and a defined 'form' property.");
+            static::err("The 'attribute2' property must be set for a 'range' type markup and a defined 'form' property.");
         }
     }
 
@@ -383,25 +384,25 @@ public function registerAssets()
         }
         $view = $this->getView();
         if (!empty($this->_langFile)) {
-            DatePickerAsset::register($view)->js[] = $this->_langFile;
-        } else {
-            DatePickerAsset::register($view);
+            LanguageAsset::register($view)->js[] = $this->_langFile;
         }
-        $id = "jQuery('#" . $this->options['id'] . "')";
+        DatePickerAsset::register($view);
+        $id = $this->options['id'];
+        $input = "jQuery('#{$id}')";
         $el = "jQuery('#" . $this->options['data-datepicker-source'] . "')";
         $this->registerPlugin($this->pluginName, $el);
         if ($this->type === self::TYPE_INLINE) {
-            $view->registerJs("{$el}.on('changeDate',function(e){{$id}.val(e.format()).trigger('change')});");
+            $view->registerJs("{$el}.on('changeDate',function(e){{$input}.val(e.format()).trigger('change')});");
         }
         if ($this->_hasAddon && $this->removeButton !== false) {
-            $view->registerJs("initDPRemove('" . $this->options['id'] . "');");
+            $view->registerJs("initDPRemove('{$id}');");
         }
         if ($this->_hasAddon) {
-            $view->registerJs("initDPAddon('" . $this->options['id'] . "');");
+            $view->registerJs("initDPAddon('{$id}');");
         }
         if ($this->type === self::TYPE_RANGE) {
             FieldRangeAsset::register($view);
-            $view->registerJs("initDPRemove('" . $this->options['id'] . "', true);");
+            $view->registerJs("initDPRemove('{$id}', true);");
         }
     }
 }

DatePickerAsset.php

@@ -4,7 +4,7 @@
  * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015
  * @package yii2-widgets
  * @subpackage yii2-widget-datepicker
- * @version 1.3.4
+ * @version 1.3.5
  */
 
 namespace kartik\date;
@@ -19,6 +19,14 @@
  */
 class DatePickerAsset extends AssetBundle
 {
+    /**
+     * @inheritdoc
+     */
+    public $depends = ['\kartik\date\LanguageAsset'];
+
+    /**
+     * @inheritdoc
+     */
     public function init()
     {
         $this->setSourcePath(__DIR__ . '/assets');

LanguageAsset.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015
+ * @package yii2-date-range
+ * @version 1.6.5
+ */
+
+namespace kartik\date;
+
+use kartik\base\AssetBundle;
+
+/**
+ * Language asset bundle for \kartik\date\DatePicker.
+ *
+ * @author Kartik Visweswaran <[email protected]>
+ * @since 1.0
+ */
+class LanguageAsset extends AssetBundle
+{
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        $this->setSourcePath(__DIR__ . '/assets');
+        parent::init();
+    }
+}

README.md

@@ -38,7 +38,7 @@ to the `require` section of your `composer.json` file.
 
 ## Latest Release
 
-> NOTE: The latest version of the module is v1.3.4. Refer the [CHANGE LOG](https://github.com/kartik-v/yii2-widget-datepicker/blob/master/CHANGE.md) for details.
+> NOTE: The latest version of the module is v1.3.5. Refer the [CHANGE LOG](https://github.com/kartik-v/yii2-widget-datepicker/blob/master/CHANGE.md) for details.
 
 ## Demo
 

assets/css/datepicker-kv.css

@@ -2,7 +2,7 @@
  * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015
  * @package yii2-widgets
  * @subpackage yii2-widget-datepicker
- * @version 1.3.4
+ * @version 1.3.5
  *
  * Custom styling for Datepicker
  * Built for Yii Framework 2.0

assets/css/datepicker-kv.min.css

@@ -2,7 +2,7 @@
  * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015
  * @package yii2-widgets
  * @subpackage yii2-widget-datepicker
- * @version 1.3.4
+ * @version 1.3.5
  *
  * Custom styling for Datepicker
  * Built for Yii Framework 2.0

assets/js/bootstrap-datepicker.js

@@ -460,7 +460,7 @@
 		show: function(){
 			// validate specifically for Krajee Yii2 Datepicker container and layout enhancements
 			var el = this.element.is('input') ? this.element : this.element.find('input.krajee-datepicker');
-			if (el.attr('readonly') && this.o.enableOnReadonly === false) {
+			if (el.attr('readonly') && this.o.enableOnReadonly === false)
 				return;
 			if (!this.isInline)
 				this.picker.appendTo(this.o.container);

assets/js/datepicker-kv.js

@@ -2,7 +2,7 @@
  * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015
  * @package yii2-widgets
  * @subpackage yii2-widget-datepicker
- * @version 1.3.4
+ * @version 1.3.5
  *
  * Extension to bootstrap datepicker to use noconflict approach
  * so that the plugin does not conflict with other jquery plugins

assets/js/datepicker-kv.min.js

@@ -2,7 +2,7 @@
  * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015
  * @package yii2-widgets
  * @subpackage yii2-widget-datepicker
- * @version 1.3.4
+ * @version 1.3.5
  *
  * Extension to bootstrap datepicker to use noconflict approach
  * so that the plugin does not conflict with other jquery plugins