Skip to content

Commit b30936d

Browse files
kartik-vkartik-v
committed
Updates to release v2.2.1 fixes kartik-v#334 fixes kartik-v#332 
1 parent 05ed365 commit b30936d

24 files changed

+38
-49
lines changed

‎CHANGE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ Change Log: `yii2-widget-select2`
33

44
## Version 2.2.1
55

6-
**Date:** _under development_
6+
**Date:** 09-Jun-2021
77

8+
- (enh #334): Correct multiple select placeholder styles.
9+
- (enh #332): Enhance Select2 required attribute validation when used with model.
810
- Fix Krajee BS themes styling for multiple select.
911

1012
## Version 2.2.0

‎LICENSE.md

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

‎src/Select2.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1
@@ -128,7 +128,8 @@ class Select2 extends InputWidget
128128
* - `unselectLabel`: _string_, the markup to be shown to unselect all records. Defaults to:
129129
* `<i class="glyphicon glyphicon-checked"></i> Unselect all`.
130130
* - `selectOptions`: _array_, the HTML attributes for the container wrapping the select label. Defaults to `[]`.
131-
* - `unselectOptions`: _array_, the HTML attributes for the container wrapping the unselect label. Defaults to `[]`.
131+
* - `unselectOptions`: _array_, the HTML attributes for the container wrapping the unselect label. Defaults to
132+
* `[]`.
132133
* - `options`: _array_, the HTML attributes for the toggle button container. Defaults to:
133134
* `['class' => 's2-togall-button']`.
134135
*/
@@ -458,15 +459,9 @@ protected function isRequired()
458459
}
459460
$validators = $this->model->getActiveValidators($this->attribute);
460461
foreach ($validators as $validator) {
461-
if ($validator instanceof RequiredValidator) {
462-
if (is_callable($validator->when)) {
463-
if (call_user_func($validator->when, $this->model, $this->attribute)) {
464-
return true;
465-
}
466-
} else {
467-
return true;
468-
}
469-
462+
if ($validator instanceof RequiredValidator && (!is_callable($validator->when) ||
463+
call_user_func($validator->when, $this->model, $this->attribute))) {
464+
return true;
470465
}
471466
}
472467
return false;

‎src/Select2Asset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/Select2KrajeeAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeBootstrapAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeClassicAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeDefaultAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeKrajeeAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeKrajeeBs4Asset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

‎src/ThemeMaterialAsset.php

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

33
/**
4-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
4+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
55
* @package yii2-widgets
66
* @subpackage yii2-widget-select2
77
* @version 2.2.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
33
* @version 2.2.1
44
*
55
* Additional CSS for Select2 for extra functionalities added by Krajee

‎src/assets/css/select2-addl.min.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
33
* @version 2.2.1
44
*
55
* Additional CSS for Select2 for extra functionalities added by Krajee

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
}
322322
.select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
323323
background: transparent;
324-
padding: 0 3px;
324+
padding: 6px;
325325
height: 32px;
326326
line-height: 1.428571429;
327327
margin-top: 0;
@@ -374,7 +374,6 @@
374374
padding: 0 5px;
375375
}
376376
.select2-container--bootstrap.input-sm .select2-selection--multiple .select2-search--inline .select2-search__field, .input-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field, .form-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
377-
padding: 0 10px;
378377
font-size: 12px;
379378
height: 28px;
380379
line-height: 1.5;
@@ -410,7 +409,7 @@
410409
padding: 0 10px;
411410
}
412411
.select2-container--bootstrap.input-lg .select2-selection--multiple .select2-search--inline .select2-search__field, .input-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field, .form-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
413-
padding: 0 16px;
412+
padding: 12px;
414413
font-size: 18px;
415414
height: 44px;
416415
line-height: 1.3333333;

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/css/select2-krajee-bs4.css

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
33
* @version 2.2.1
44
*
55
* Krajee Bootstrap 4.x Theme for Select2
@@ -52,16 +52,8 @@
5252
outline: 0;
5353
}
5454

55-
.select2-container--krajee-bs4 .select2-search__field::-webkit-input-placeholder,
56-
.select2-container--krajee-bs4 .select2-search__field:-moz-placeholder,
57-
.select2-container--krajee-bs4 .select2-search__field::-moz-placeholder,
58-
.select2-container--krajee-bs4 .select2-search__field:-ms-input-placeholder {
55+
.select2-container--krajee-bs4 .select2-search__field::placeholder {
5956
color: #999;
60-
61-
}
62-
63-
.select2-container--krajee-bs4 .select2-search__field::-moz-placeholder {
64-
opacity: 1;
6557
}
6658

6759
.select2-container--krajee-bs4 .select2-dropdown[dir="rtl"] .select2-search__field {
@@ -358,7 +350,7 @@
358350

359351
.select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field {
360352
background: transparent;
361-
padding: 0 0.2rem;
353+
padding: 0.5rem;
362354
height: 2.25rem;
363355
line-height: 1.5;
364356
margin-top: 0;
@@ -493,7 +485,7 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
493485

494486
.input-sm.select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field,
495487
.input-group-sm .select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field {
496-
padding: 0 0.625rem;
488+
padding: 0.35rem;
497489
font-size: 0.875rem;
498490
height: calc(1.875rem - 1px);
499491
line-height: 1.5;
@@ -533,7 +525,8 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
533525

534526
.input-lg.select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field,
535527
.input-group-lg .select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field {
536-
margin: 0.25rem;
528+
font-size: 1.25rem;
529+
padding: 0.5625rem;
537530
font-size: 1.25rem;
538531
}
539532

‎src/assets/css/select2-krajee-bs4.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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
33
* @version 2.2.1
44
*
55
* Krajee Bootstrap 3.x Theme for Select2

‎src/assets/css/select2-krajee.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
33
* @version 2.2.1
44
*
55
* Material Theme for Select2

‎src/assets/css/select2-material.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/js/select2-krajee.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
2+
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
33
* @version 2.2.1
44
*
55
* Additional enhancements for Select2 widget extension for Yii 2.0.

‎src/assets/js/select2-krajee.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)