Skip to content

Commit cb445c6

Browse files
kartik-vkartik-v
committed
Updates to release v1.7.2 fix #146 fix #147 
1 parent 49572ae commit cb445c6

10 files changed

+48
-27
lines changed

‎CHANGE.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Change Log: `yii2-date-range`
22
=============================
33

4+
## Version 1.7.2
5+
6+
**Date:** 29-Jan-2020
7+
8+
- (enh #147): Allow date range picker value to be cleared for preset dropdown.
9+
- (enh #146): Enhance preset dropdown user interface.
10+
- (enh #143): Update initSettings to support indexes .
11+
412
## Version 1.7.1
513

614
**Date:** 17-May-2019

‎src/DateRangeBehavior.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
55
* @package yii2-date-range
6-
* @version 1.7.1
6+
* @version 1.7.2
77
*/
88

99
namespace kartik\daterange;

‎src/DateRangePicker.php‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
55
* @package yii2-date-range
6-
* @version 1.7.1
6+
* @version 1.7.2
77
*/
88

99
namespace kartik\daterange;
@@ -128,6 +128,7 @@ class DateRangePicker extends InputWidget
128128
<div class="kv-drp-dropdown">
129129
<span class="left-ind">{pickerIcon}</span>
130130
<input type="text" readonly class="form-control range-value" value="{value}">
131+
<span class="right-ind kv-clear" style="" title="Clear">&times;</span>
131132
<span class="right-ind"><b class="caret"></b></span>
132133
</div>
133134
{input}
@@ -300,7 +301,7 @@ public function registerAssets()
300301
$nowTo = "moment().format('{$this->_format}')";
301302
// parse input change correctly when range input value is cleared
302303
$js = <<< JS
303-
{$input}.off('change.kvdrp').on('change.kvdrp', function() {
304+
{$input}.off('change.kvdrp').on('change.kvdrp', function(e) {
304305
var drp = {$id}.data('{$this->pluginName}'), fm, to;
305306
if ($(this).val() || !drp) {
306307
return;
@@ -312,11 +313,14 @@ public function registerAssets()
312313
{$rangeJs}
313314
});
314315
JS;
315-
if ($this->presetDropdown && empty($this->value)) {
316+
if ($this->presetDropdown) {
316317
$js .= <<< JS
317-
var val = {$nowFrom} + '{$this->_separator}' + {$nowTo};
318-
{$id}.find('.range-value').val(val);
319-
{$input}.val(val);
318+
{$id}.find('.range-value').attr('placeholder', {$input}.attr('placeholder'));
319+
{$id}.find('.kv-clear').on('click', function(e) {
320+
e.stopPropagation();
321+
{$id}.find('.range-value').val('');
322+
{$input}.val('').trigger('change').trigger('cancel.daterangepicker');
323+
});
320324
JS;
321325
}
322326
$view->registerJs($js);

‎src/DateRangePickerAsset.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
55
* @package yii2-date-range
6-
* @version 1.7.1
6+
* @version 1.7.2
77
*/
88

99
namespace kartik\daterange;

‎src/LanguageAsset.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
55
* @package yii2-date-range
6-
* @version 1.7.1
6+
* @version 1.7.2
77
*/
88

99
namespace kartik\daterange;

‎src/MomentAsset.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
55
* @package yii2-date-range
6-
* @version 1.7.1
6+
* @version 1.7.2
77
*/
88

99
namespace kartik\daterange;

‎src/assets/css/daterangepicker-kv.css‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
3-
* @version 1.7.1
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
3+
* @version 1.7.2
44
*
55
* Custom styling for DateRangePicker
66
*
@@ -14,15 +14,15 @@
1414

1515
.kv-drp-dropdown .range-value {
1616
background: none;
17-
padding-left: 32px;
18-
padding-right: 32px;
17+
padding-left: 2rem;
1918
opacity: 0.9;
19+
width: 100%;
2020
}
2121

2222
.kv-drp-dropdown .left-ind,
2323
.kv-drp-dropdown .right-ind {
2424
position: absolute;
25-
top: 8px;
25+
top: 0.4rem;
2626
}
2727

2828
.kv-drp-dropdown .left-ind {
@@ -33,8 +33,17 @@
3333
right: 12px;
3434
}
3535

36+
.kv-drp-dropdown .kv-clear {
37+
padding:0 0.3rem;
38+
font-size: 1.1rem;
39+
cursor:pointer;
40+
right:1.6rem;
41+
line-height:1.3rem;
42+
}
43+
3644
.kv-drp-dropdown .caret {
3745
display: inline-block;
46+
cursor: pointer;
3847
width: 0;
3948
height: 0;
4049
vertical-align: 0.255em;

‎src/assets/css/daterangepicker-kv.min.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
3-
* @version 1.7.1
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
3+
* @version 1.7.2
44
*
55
* Custom styling for DateRangePicker
66
*
77
* Author: Kartik Visweswaran
88
* For more JQuery plugins visit http://plugins.krajee.com
99
* For more Yii related demos visit http://demos.krajee.com
10-
*/.kv-drp-container .kv-drp-dropdown{position:relative}.kv-drp-dropdown .range-value{background:0 0;padding-left:32px;padding-right:32px;opacity:.9}.kv-drp-dropdown .left-ind,.kv-drp-dropdown .right-ind{position:absolute;top:8px}.kv-drp-dropdown .left-ind{left:12px}.kv-drp-dropdown .right-ind{right:12px}.kv-drp-dropdown .caret{display:inline-block;width:0;height:0;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}
10+
*/.kv-drp-container .kv-drp-dropdown{position:relative}.kv-drp-dropdown .range-value{background:0 0;padding-left:2rem;opacity:.9;width:100%}.kv-drp-dropdown .left-ind,.kv-drp-dropdown .right-ind{position:absolute;top:.4rem}.kv-drp-dropdown .left-ind{left:12px}.kv-drp-dropdown .right-ind{right:12px}.kv-drp-dropdown .kv-clear{padding:0 .3rem;font-size:1.1rem;cursor:pointer;right:1.6rem;line-height:1.3rem}.kv-drp-dropdown .caret{display:inline-block;cursor:pointer;width:0;height:0;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}

‎src/assets/css/daterangepicker.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2019
3-
* @version 1.7.1
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015- 2020
3+
* @version 1.7.2
44
*
55
* Modified Bootstrap 3.x & 4.x styling for DateRangePicker
66
*

‎src/assets/css/daterangepicker.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)