Skip to content

Commit 78efbcd

Browse files
kartik-vkartik-v
committed
Updates to release v2.1.8 fixes kartik-v#326 
1 parent d44105a commit 78efbcd

28 files changed

+339
-215
lines changed

‎CHANGE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Change Log: `yii2-widget-select2`
22
=================================
33

4+
## Version 2.1.8
5+
6+
**Date:** 21-Jul-2020
7+
8+
- (enh #326): Correct styling for all themes.
9+
- (enh #321): Add Kazakh Translations.
10+
- (enh #316): Add Uzbek Translations.
11+
- (enh #311): Add Turkish Translations.
12+
413
## Version 2.1.7
514

615
**Date:** 15-Nov-2019

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014 - 2019, Kartik Visweswaran
1+
Copyright (c) 2014 - 2020, Kartik Visweswaran
22
Krajee.com
33
All rights reserved.
44

‎src/Select2.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;
@@ -236,7 +236,11 @@ public function renderWidget()
236236
if (empty($this->data)) {
237237
$emptyValue = !isset($this->value) || $this->value === '';
238238
$emptyInitText = !isset($this->initValueText) || $this->initValueText === '';
239-
$emptyData = !isset($this->pluginOptions['placeholder']) && !$multiple ? ['' => '']: [];
239+
if (!isset($this->pluginOptions['placeholder']) && !$multiple && $this->isRequired()) {
240+
$emptyData = ['' => ''];
241+
} else {
242+
$emptyData = [];
243+
}
240244
if ($emptyValue && $emptyInitText) {
241245
$this->data = $emptyData;
242246
} else {
@@ -435,4 +439,21 @@ public function registerAssets()
435439
}
436440
$this->registerPlugin($this->pluginName, "jQuery('#{$id}')", "initS2Loading('{$id}','{$this->_s2OptionsVar}')");
437441
}
442+
443+
protected function isRequired()
444+
{
445+
if (!empty($this->options['required'])) {
446+
return true;
447+
}
448+
if (!$this->hasModel()) {
449+
return false;
450+
}
451+
$validators = $this->model->getValidators($this->attribute);
452+
foreach ($validators as $validator) {
453+
if ($validator instanceof yii\validators\RequiredValidator) {
454+
return true;
455+
}
456+
}
457+
return false;
458+
}
438459
}

‎src/Select2Asset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/Select2KrajeeAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeBootstrapAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeClassicAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeDefaultAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeKrajeeAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeKrajeeBs4Asset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;

‎src/ThemeMaterialAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
7-
* @version 2.1.7
7+
* @version 2.1.8
88
*/
99

1010
namespace kartik\select2;
@@ -14,7 +14,7 @@
1414
*
1515
* @author Mohamad Faeez <[email protected]>
1616
* @modified Kartik Visweswaran <[email protected]>
17-
* @since 2.1.7
17+
* @since 2.1.8
1818
*/
1919
class ThemeMaterialAsset extends ThemeAsset
2020
{

‎src/assets/css/select2-addl.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, 2014 - 2019
3-
* @version 2.1.7
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
3+
* @version 2.1.8
44
*
55
* Additional CSS for Select2 for extra functionalities added by Krajee
66
*

‎src/assets/css/select2-addl.min.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, 2014 - 2019
3-
* @version 2.1.7
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
3+
* @version 2.1.8
44
*
55
* Additional CSS for Select2 for extra functionalities added by Krajee
66
*

‎src/assets/css/select2-bootstrap.css

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,33 @@
190190
border-top-color: transparent;
191191
}
192192
.select2-container--bootstrap .select2-selection__clear {
193+
position: absolute;
193194
color: #999;
194195
cursor: pointer;
195196
float: right;
196197
font-weight: bold;
197-
margin-right: 10px;
198198
}
199199
.select2-container--bootstrap .select2-selection__clear:hover {
200200
color: #333;
201201
}
202+
.select2-container--bootstrap .select2-selection--single .select2-selection__clear,
203+
.select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
204+
font-size: 16px;
205+
}
206+
.select2-container--bootstrap .select2-selection--single .select2-selection__clear {
207+
right: 1.2rem;
208+
}
209+
.select2-container--bootstrap[dir="rtl"] .select2-selection--single .select2-selection__clear {
210+
left: 1.2rem;
211+
right: auto;
212+
}
213+
.select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
214+
right: 1rem;
215+
}
216+
.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-selection__clear {
217+
left: 1rem;
218+
right: auto;
219+
}
202220
.select2-container--bootstrap.select2-container--disabled .select2-selection {
203221
border-color: #ccc;
204222
-webkit-box-shadow: none;
@@ -282,9 +300,8 @@
282300
line-height: 1.428571429;
283301
list-style: none;
284302
margin: 0;
285-
overflow: hidden;
286303
padding: 0;
287-
width: 100%;
304+
overflow: hidden;
288305
text-overflow: ellipsis;
289306
white-space: nowrap;
290307
}
@@ -312,11 +329,17 @@
312329
min-width: 5em;
313330
}
314331
.select2-container--bootstrap .select2-selection--multiple .select2-selection__choice__remove {
332+
border: none;
333+
background: none;
334+
box-shadow: none;
335+
outline: none;
315336
color: #999;
316337
cursor: pointer;
317338
display: inline-block;
318-
font-weight: bold;
339+
font-weight: 700;
319340
margin-right: 3px;
341+
font-size: 1rem;
342+
line-height: 1.2rem;
320343
}
321344
.select2-container--bootstrap .select2-selection--multiple .select2-selection__choice__remove:hover {
322345
color: #333;

0 commit comments

Comments
 (0)