Update to release v1.3.3

kartik-v · kartik-v · commit 577189459726 · 2015-06-27T02:06:39.000+05:30
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,11 +1,13 @@
 version 1.3.3
 =============
-**Date:** 15-Jun-2015
+**Date:** 27-Jun-2015
 
 - (enh #27): Enhance plugin to use no conflict approach.
 - (enh #28): Update to latest version of bootstrap-datepicker.
-- (enh #29): Fix locale js files to use the new noconflict kvDatepicker function.
+- (enh #29): Fix locale js files to use the new noconflict `kvDatepicker` function.
 - (enh #30): Add Ukranian translations.
+- (bug #35): Parse `title` correctly for calendar/remove button addon.
+- (enh #36): Configure addon for prepend, append, and range.
 - (enh #39): Add Spanish translations.
 
 version 1.3.2
diff --git a/DatePicker.php b/DatePicker.php
@@ -66,7 +66,8 @@ class DatePicker extends \kartik\base\InputWidget
      * - 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, the title to be displayed on hover. Defaults to 'Select date & time'.
+     *   - title - string|bool, the title to be displayed on hover. Defaults to 'Select date & time'. To disable,
+     *     set it to `false`.
      */
     public $pickerButton = [];
 
@@ -78,7 +79,8 @@ class DatePicker extends \kartik\base\InputWidget
      * - 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'.
+     *   - title - string, the title to be displayed on hover. Defaults to 'Clear field'. To disable,
+     *     set it to `false`.
      */
     public $removeButton = [];
     
@@ -88,10 +90,18 @@ class DatePicker extends \kartik\base\InputWidget
     public $options = [];
 
     /**
-     * @var string The addon that will be prepended/appended for a
-     * [[TYPE_COMPONENT_PREPEND]] and [[TYPE_COMPONENT_APPEND]]
+     * @var array The addon that will be prepended/appended for a  [[TYPE_COMPONENT_PREPEND]] and
+     * [[TYPE_COMPONENT_APPEND]]. You can set the following array keys:
+     * - part1: string, the content to prepend before the [[TYPE_COMPONENT_PREPEND]] OR 
+     *          before input # 1 for [[TYPE_RANGE]].
+     * - part2: string, the content to prepend after the [[TYPE_COMPONENT_PREPEND]]  OR 
+     *          after input # 1 for [[TYPE_RANGE]].
+     * - part3: string, the content to append before the [[TYPE_COMPONENT_APPEND]]  OR 
+     *          before input # 2 for [[TYPE_RANGE]].
+     * - part4: string, the content to append after the [[TYPE_COMPONENT_APPEND]] OR 
+     *          after input # 2 for [[TYPE_RANGE]].
      */
-    public $addon = self::CALENDAR_ICON;
+    public $addon = [];
 
     /**
      * @var string the model attribute 2 if you are using [[TYPE_RANGE]]
@@ -168,6 +178,9 @@ public function init()
         if (isset($this->form) && ($this->type === self::TYPE_RANGE) && (!isset($this->attribute2))) {
             throw new InvalidConfigException("The 'attribute2' property must be set for a 'range' type markup and a defined 'form' property.");
         }
+        if (isset($this->addon) && !is_array($this->addon)) {
+            throw new InvalidConfigException("The 'addon' property must be setup as an array with 'part1', 'part2', 'part3', and/or 'part4' keys.");
+        }
         $s = DIRECTORY_SEPARATOR;
         $this->initI18N(__DIR__);
         $this->setLanguage('bootstrap-datepicker.', __DIR__ . "{$s}assets{$s}", null, '.min.js');
@@ -222,11 +235,9 @@ protected function renderAddon(&$options, $type = 'picker')
         $icon = ($type === 'picker') ? 'calendar' : 'remove';
         Html::addCssClass($options, 'input-group-addon kv-date-' . $icon);
         $icon = '<i class="glyphicon glyphicon-' . ArrayHelper::remove($options, 'icon', $icon) . '"></i>';
-        if (empty($options['title'])) {
-            $title = ($type === 'picker') ? Yii::t('kvdate', 'Select date') : Yii::t('kvdate', 'Clear field');
-            if ($title != false) {
-                $options['title'] = $title;
-            }
+        $title = ArrayHelper::getValue($options, 'title', '');
+        if ($title !== false && empty($title)) {
+            $options['title'] = ($type === 'picker') ? Yii::t('kvdate', 'Select date') : Yii::t('kvdate', 'Clear field');
         }
         return Html::tag('span', $icon, $options);
     }
@@ -252,13 +263,21 @@ protected function parseMarkup($input)
         if ($this->type == self::TYPE_INPUT) {
             return $input;
         }
+        $part1 = $part2 = $part3 = $part4 = '';
+        if (!empty($this->addon) && ($this->_hasAddon || $this->type == self::TYPE_RANGE)) {
+            $part1 = ArrayHelper::getValue($this->addon, 'part1', '');
+            $part2 = ArrayHelper::getValue($this->addon, 'part2', '');
+            $part3 = ArrayHelper::getValue($this->addon, 'part3', '');
+            $part4 = ArrayHelper::getValue($this->addon, 'part4', '');
+        }
         if ($this->_hasAddon) {
             Html::addCssClass($this->_container, 'date');
             $picker = $this->renderAddon($this->pickerButton);
             $remove = $this->renderAddon($this->removeButton, 'remove');
-            $content = $picker . $remove . $input;
             if ($this->type == self::TYPE_COMPONENT_APPEND) {
-                $content = $input . $remove . $picker;
+                $content = $part1 . $part2 . $input . $part3 . $remove . $picker . $part4;
+            } else {
+                $content = $part1 . $picker . $remove . $part2 . $input . $part3 . $part4;
             }
             return Html::tag('div', $content, $this->_container);
         }
@@ -297,7 +316,9 @@ protected function parseMarkup($input)
                     Html::activeTextInput($this->model, $this->attribute2, $this->options2) :
                     Html::textInput($this->name2, $this->value2, $this->options2);
             }
-            return Html::tag('div', "{$input}<span class='input-group-addon kv-field-separator'>{$this->separator}</span>{$input2}", $this->_container);
+            $content = $part1 . $input . $part2 . "<span class='input-group-addon kv-field-separator'>{$this->separator}</span>" .
+                $part3 . $input2 . $part4;
+            return Html::tag('div', $content, $this->_container);
         }
         if ($this->type == self::TYPE_INLINE) {
             $this->_id = $this->options['id'] . '-inline';
@@ -332,13 +353,15 @@ public function registerAssets()
         } else {
             $this->registerPlugin($this->pluginName, "{$id}.parent()");
         }
-        if ($this->removeButton !== false && $this->_hasAddon) {
-            $view->registerJs("{$id}.parent().find('.kv-date-remove').on('click', function() {
-            {$id}.parent().{$this->pluginName}('clearDates');
-            });");
+        if ($this->_hasAddon && $this->removeButton !== false) {
+            $view->registerJs("initDPRemove('" . $this->options['id'] . "');");
+        }
+        if ($this->_hasAddon && !empty($this->addon)) {
+            $view->registerJs("initDPAddon('" . $this->options['id'] . "');");
         }
         if ($this->type === self::TYPE_RANGE) {
             \kartik\field\FieldRangeAsset::register($view);
+            $view->registerJs("initDPRemove('" . $this->options['id'] . "', true);");
         }
     }
 }
diff --git a/DatePickerAsset.php b/DatePickerAsset.php
@@ -17,7 +17,6 @@
  */
 class DatePickerAsset extends \kartik\base\AssetBundle
 {
-
     public function init()
     {
         $this->setSourcePath(__DIR__ . '/assets');
diff --git a/LICENSE.md b/LICENSE.md
@@ -25,4 +25,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -25,13 +25,13 @@ The preferred way to install this extension is through [composer](http://getcomp
 To install, either run
 
 ```
-$ php composer.phar require kartik-v/yii2-widget-datepicker "*"
+$ php composer.phar require kartik-v/yii2-widget-datepicker "@dev"
 ```
 
 or add
 
 ```
-"kartik-v/yii2-widget-datepicker": "*"
+"kartik-v/yii2-widget-datepicker": "@dev"
 ```
 
 to the ```require``` section of your `composer.json` file.
diff --git a/assets/css/datepicker-kv.css b/assets/css/datepicker-kv.css
@@ -22,6 +22,21 @@
     opacity: .65;
 }
 
-.input-group.date .input-group-addon span {
-  cursor: pointer;
+.input-group.date .input-group-addon  {
+    cursor: default;
 }
+
+.input-group.date .kv-date-remove, .input-group.date .kv-date-calendar,
+.input-group.date .kv-date-remove, .input-group.date .kv-date-calendar,
+.input-group.input-daterange .kv-date-remove, .input-group.input-daterange .kv-date-calendar,
+.input-group.input-daterange .kv-date-remove, .input-group.input-daterange .kv-date-calendar {
+    cursor: pointer;
+}
+
+.input-group.input-daterange .input-group-addon {
+    border-left: 1px solid #ccc;
+}
+
+.input-group.input-daterange .input-group-addon:last-child {
+    border-right: 1px solid #ccc;
+}
diff --git a/assets/css/datepicker-kv.min.css b/assets/css/datepicker-kv.min.css
@@ -9,4 +9,4 @@
  * Author: Kartik Visweswaran
  * Year: 2015
  * For more Yii related demos visit http://demos.krajee.com
- */.datepicker{z-index:1151!important}.input-group.date.disabled .input-group-addon .glyphicon{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.input-group.date .input-group-addon span{cursor:pointer}
+ */.datepicker{z-index:1151!important}.input-group.date.disabled .input-group-addon .glyphicon{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.input-group.date .input-group-addon{cursor:default}.input-group.date .kv-date-calendar,.input-group.date .kv-date-remove,.input-group.input-daterange .kv-date-calendar,.input-group.input-daterange .kv-date-remove{cursor:pointer}.input-group.input-daterange .input-group-addon{border-left:1px solid #ccc}.input-group.input-daterange .input-group-addon:last-child{border-right:1px solid #ccc}
diff --git a/assets/js/datepicker-kv.js b/assets/js/datepicker-kv.js
@@ -13,6 +13,30 @@
  * Year: 2015
  * For more Yii related demos visit http://demos.krajee.com
  */
+var initDPRemove = function() {
+}, initDPAddon = function() {
+};
 (function ($) {
     $.fn.kvDatepicker = $.fn.datepicker.noConflict();
+    initDPRemove = function(id, range) {
+        var $id = $('#' + id), $el =  $id.parent();
+        $el.find('.kv-date-remove').on('click.kvdatepicker', function() {
+            if (range) {
+                $el.find('input[type="text"]').each(function() {
+                    $(this).kvDatepicker('clearDates');
+                });
+            } else {
+                $el.kvDatepicker('clearDates');
+            }
+        });
+    };
+    initDPAddon = function(id) {
+        var $id = $('#' + id), $el = $id.parent();
+        $el.find('.input-group-addon:not(.kv-date-calendar):not(.kv-date-remove)').each(function() {
+            var $addon = $(this);
+            $addon.on('click.kvdatepicker', function(e) {
+                $el.kvDatepicker('hide');
+            });
+        });
+    };
 })(window.jQuery);
diff --git a/assets/js/datepicker-kv.min.js b/assets/js/datepicker-kv.min.js
@@ -12,4 +12,4 @@
  * Author: Kartik Visweswaran
  * Year: 2015
  * For more Yii related demos visit http://demos.krajee.com
- */!function(n){n.fn.kvDatepicker=n.fn.datepicker.noConflict()}(window.jQuery);
+ */var initDPRemove=function(){},initDPAddon=function(){};!function(n){n.fn.kvDatepicker=n.fn.datepicker.noConflict(),initDPRemove=function(e,t){var i=n("#"+e),c=i.parent();c.find(".kv-date-remove").on("click.kvdatepicker",function(){t?c.find('input[type="text"]').each(function(){n(this).kvDatepicker("clearDates")}):c.kvDatepicker("clearDates")})},initDPAddon=function(e){var t=n("#"+e),i=t.parent();i.find(".input-group-addon:not(.kv-date-calendar):not(.kv-date-remove)").each(function(){var e=n(this);e.on("click.kvdatepicker",function(n){i.kvDatepicker("hide")})})}}(window.jQuery);
diff --git a/composer.json b/composer.json
@@ -12,13 +12,12 @@
             "homepage": "http://www.krajee.com/"
         }
     ],
-	"minimum-stability": "stable",
     "require": {
-        "kartik-v/yii2-krajee-base": "*"
+        "kartik-v/yii2-krajee-base": "~1.7"
     },
     "autoload": {
         "psr-4": {
             "kartik\\date\\": ""
         }
     }
-}
+}
diff --git a/messages/config.php b/messages/config.php
@@ -49,4 +49,4 @@
     // When format is "db", you may specify the following two options
     //'db' => 'db',
     //'sourceMessageTable' => '{{%source_message}}',
-];
+];
diff --git a/messages/en/kvdate.php b/messages/en/kvdate.php
@@ -19,4 +19,4 @@
 return [
     'Clear field' => '',
     'Select date' => '',
-];
+];
diff --git a/messages/es/kvdate.php b/messages/es/kvdate.php
@@ -19,4 +19,4 @@
 return [
     'Clear field' => 'Limpiar campo',
     'Select date' => 'Seleccionar fecha',
-];
+];

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`*/`
`18`	`18`	`class DatePickerAsset extends \kartik\base\AssetBundle`
`19`	`19`	`{`
`20`		`-`
`21`	`20`	`public function init()`
`22`	`21`	`{`
`23`	`22`	`$this->setSourcePath(__DIR__ . '/assets');`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,12 @@`
`12`	`12`	`"homepage": "http://www.krajee.com/"`
`13`	`13`	`}`
`14`	`14`	`],`
`15`		`- "minimum-stability": "stable",`
`16`	`15`	`"require": {`
`17`		`- "kartik-v/yii2-krajee-base": "*"`
	`16`	`+ "kartik-v/yii2-krajee-base": "~1.7"`
`18`	`17`	`},`
`19`	`18`	`"autoload": {`
`20`	`19`	`"psr-4": {`
`21`	`20`	`"kartik\\date\\": ""`
`22`	`21`	`}`
`23`	`22`	`}`
`24`		`-}`
	`23`	`+}`