Updates to release v2.2.1 fixes #334 fixes #332

kartik-v · Jun 9, 2021 · b30936d · b30936d
1 parent 05ed365
commit b30936d
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 49 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -3,8 +3,10 @@ Change Log: `yii2-widget-select2`
 
 ## Version 2.2.1
 
-**Date:** _under development_
+**Date:** 09-Jun-2021
 
+- (enh #334): Correct multiple select placeholder styles.
+- (enh #332): Enhance Select2 required attribute validation when used with model.
 - Fix Krajee BS themes styling for multiple select.
 
 ## Version 2.2.0

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2014 - 2020, Kartik Visweswaran  
+Copyright (c) 2014 - 2021, Kartik Visweswaran  
 Krajee.com  
 All rights reserved.  
 

diff --git a/src/Select2.php b/src/Select2.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1
@@ -128,7 +128,8 @@ class Select2 extends InputWidget
      * - `unselectLabel`: _string_, the markup to be shown to unselect all records. Defaults to:
      *   `<i class="glyphicon glyphicon-checked"></i> Unselect all`.
      * - `selectOptions`: _array_, the HTML attributes for the container wrapping the select label. Defaults to `[]`.
-     * - `unselectOptions`: _array_, the HTML attributes for the container wrapping the unselect label. Defaults to `[]`.
+     * - `unselectOptions`: _array_, the HTML attributes for the container wrapping the unselect label. Defaults to
+     *     `[]`.
      * - `options`: _array_, the HTML attributes for the toggle button container. Defaults to:
      *   `['class' => 's2-togall-button']`.
      */
@@ -458,15 +459,9 @@ protected function isRequired()
         }
         $validators = $this->model->getActiveValidators($this->attribute);
         foreach ($validators as $validator) {
-            if ($validator instanceof RequiredValidator) {
-                if (is_callable($validator->when)) {
-                    if (call_user_func($validator->when, $this->model, $this->attribute)) {
-                        return true;
-                    }
-                } else {
-                    return true;
-                }
-
+            if ($validator instanceof RequiredValidator && (!is_callable($validator->when) ||
+                    call_user_func($validator->when, $this->model, $this->attribute))) {
+                return true;
             }
         }
         return false;

diff --git a/src/Select2Asset.php b/src/Select2Asset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/Select2KrajeeAsset.php b/src/Select2KrajeeAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeAsset.php b/src/ThemeAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeBootstrapAsset.php b/src/ThemeBootstrapAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeClassicAsset.php b/src/ThemeClassicAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeDefaultAsset.php b/src/ThemeDefaultAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeKrajeeAsset.php b/src/ThemeKrajeeAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeKrajeeBs4Asset.php b/src/ThemeKrajeeBs4Asset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/ThemeMaterialAsset.php b/src/ThemeMaterialAsset.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
  * @version 2.2.1

diff --git a/src/assets/css/select2-addl.css b/src/assets/css/select2-addl.css
@@ -1,5 +1,5 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @version 2.2.1
  *
  * Additional CSS for Select2 for extra functionalities added by Krajee

diff --git a/src/assets/css/select2-addl.min.css b/src/assets/css/select2-addl.min.css
@@ -1,5 +1,5 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @version 2.2.1
  *
  * Additional CSS for Select2 for extra functionalities added by Krajee

diff --git a/src/assets/css/select2-bootstrap.css b/src/assets/css/select2-bootstrap.css
@@ -321,7 +321,7 @@
 }
 .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
   background: transparent;
-  padding: 0 3px;
+  padding: 6px;
   height: 32px;
   line-height: 1.428571429;
   margin-top: 0;
@@ -374,7 +374,6 @@
   padding: 0 5px;
 }
 .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 {
-  padding: 0 10px;
   font-size: 12px;
   height: 28px;
   line-height: 1.5;
@@ -410,7 +409,7 @@
   padding: 0 10px;
 }
 .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 {
-  padding: 0 16px;
+  padding: 12px;
   font-size: 18px;
   height: 44px;
   line-height: 1.3333333;

diff --git a/src/assets/css/select2-bootstrap.min.css b/src/assets/css/select2-bootstrap.min.css
diff --git a/src/assets/css/select2-krajee-bs4.css b/src/assets/css/select2-krajee-bs4.css
@@ -1,5 +1,5 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @version 2.2.1
  *
  * Krajee Bootstrap 4.x Theme for Select2
@@ -52,16 +52,8 @@
     outline: 0;
 }
 
-.select2-container--krajee-bs4 .select2-search__field::-webkit-input-placeholder,
-.select2-container--krajee-bs4 .select2-search__field:-moz-placeholder,
-.select2-container--krajee-bs4 .select2-search__field::-moz-placeholder,
-.select2-container--krajee-bs4 .select2-search__field:-ms-input-placeholder {
+.select2-container--krajee-bs4 .select2-search__field::placeholder {
     color: #999;
-
-}
-
-.select2-container--krajee-bs4 .select2-search__field::-moz-placeholder {
-    opacity: 1;
 }
 
 .select2-container--krajee-bs4 .select2-dropdown[dir="rtl"] .select2-search__field {
@@ -358,7 +350,7 @@
 
 .select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field {
     background: transparent;
-    padding: 0 0.2rem;
+    padding: 0.5rem;
     height: 2.25rem;
     line-height: 1.5;
     margin-top: 0;
@@ -493,7 +485,7 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
 
 .input-sm.select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field,
 .input-group-sm .select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field {
-    padding: 0 0.625rem;
+    padding: 0.35rem;
     font-size: 0.875rem;
     height: calc(1.875rem - 1px);
     line-height: 1.5;
@@ -533,7 +525,8 @@ select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
 
 .input-lg.select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field,
 .input-group-lg .select2-container--krajee-bs4 .select2-selection--multiple .select2-search--inline .select2-search__field {
-    margin: 0.25rem;
+    font-size: 1.25rem;
+    padding: 0.5625rem;
     font-size: 1.25rem;
 }
 

diff --git a/src/assets/css/select2-krajee-bs4.min.css b/src/assets/css/select2-krajee-bs4.min.css
diff --git a/src/assets/css/select2-krajee.css b/src/assets/css/select2-krajee.css
@@ -1,5 +1,5 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @version 2.2.1
  *
  * Krajee Bootstrap 3.x Theme for Select2

diff --git a/src/assets/css/select2-krajee.min.css b/src/assets/css/select2-krajee.min.css
diff --git a/src/assets/css/select2-material.css b/src/assets/css/select2-material.css
@@ -1,5 +1,5 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @version 2.2.1
  *
  * Material Theme for Select2

diff --git a/src/assets/css/select2-material.min.css b/src/assets/css/select2-material.min.css
diff --git a/src/assets/js/select2-krajee.js b/src/assets/js/select2-krajee.js
@@ -1,5 +1,5 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2021
  * @version 2.2.1
  *
  * Additional enhancements for Select2 widget extension for Yii 2.0.

diff --git a/src/assets/js/select2-krajee.min.js b/src/assets/js/select2-krajee.min.js