Updates to release v2.1.8 fixes #326

kartik-v · Jul 22, 2020 · 78efbcd · 78efbcd
1 parent d44105a
commit 78efbcd
Show file tree

Hide file tree

Showing 28 changed files with 339 additions and 215 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,15 @@
 Change Log: `yii2-widget-select2`
 =================================
 
+## Version 2.1.8
+
+**Date:** 21-Jul-2020
+
+- (enh #326): Correct styling for all themes.
+- (enh #321): Add Kazakh Translations.
+- (enh #316): Add Uzbek Translations.
+- (enh #311): Add Turkish Translations.
+
 ## Version 2.1.7
 
 **Date:** 15-Nov-2019

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

diff --git a/src/Select2.php b/src/Select2.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;
@@ -236,7 +236,11 @@ public function renderWidget()
         if (empty($this->data)) {
             $emptyValue = !isset($this->value) || $this->value === '';
             $emptyInitText = !isset($this->initValueText) || $this->initValueText === '';
-            $emptyData = !isset($this->pluginOptions['placeholder']) && !$multiple ? ['' => '']: [];
+            if (!isset($this->pluginOptions['placeholder']) && !$multiple && $this->isRequired()) {
+                $emptyData = ['' => ''];
+            } else {
+                $emptyData = [];
+            }
             if ($emptyValue && $emptyInitText) {
                 $this->data = $emptyData;
             } else {
@@ -435,4 +439,21 @@ public function registerAssets()
         }
         $this->registerPlugin($this->pluginName, "jQuery('#{$id}')", "initS2Loading('{$id}','{$this->_s2OptionsVar}')");
     }
+
+    protected function isRequired()
+    {
+        if (!empty($this->options['required'])) {
+            return true;
+        }
+        if (!$this->hasModel()) {
+            return false;
+        }
+        $validators = $this->model->getValidators($this->attribute);
+        foreach ($validators as $validator) {
+            if ($validator instanceof yii\validators\RequiredValidator) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/Select2Asset.php b/src/Select2Asset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/Select2KrajeeAsset.php b/src/Select2KrajeeAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeAsset.php b/src/ThemeAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeBootstrapAsset.php b/src/ThemeBootstrapAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeClassicAsset.php b/src/ThemeClassicAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeDefaultAsset.php b/src/ThemeDefaultAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeKrajeeAsset.php b/src/ThemeKrajeeAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeKrajeeBs4Asset.php b/src/ThemeKrajeeBs4Asset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeMaterialAsset.php b/src/ThemeMaterialAsset.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.7
+ * @version 2.1.8
  */
 
 namespace kartik\select2;
@@ -14,7 +14,7 @@
  *
  * @author Mohamad Faeez <[email protected]>
  * @modified Kartik Visweswaran <[email protected]>
- * @since 2.1.7
+ * @since 2.1.8
  */
 class ThemeMaterialAsset extends ThemeAsset
 {

diff --git a/src/assets/css/select2-addl.css b/src/assets/css/select2-addl.css
@@ -1,6 +1,6 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version 2.1.7
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @version 2.1.8
  *
  * 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,6 +1,6 @@
 /*!
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version 2.1.7
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
+ * @version 2.1.8
  *
  * 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
@@ -190,15 +190,33 @@
   border-top-color: transparent;
 }
 .select2-container--bootstrap .select2-selection__clear {
+  position: absolute;
   color: #999;
   cursor: pointer;
   float: right;
   font-weight: bold;
-  margin-right: 10px;
 }
 .select2-container--bootstrap .select2-selection__clear:hover {
   color: #333;
 }
+.select2-container--bootstrap .select2-selection--single .select2-selection__clear,
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
+  font-size: 16px;
+}
+.select2-container--bootstrap .select2-selection--single .select2-selection__clear {
+  right: 1.2rem;
+}
+.select2-container--bootstrap[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  left: 1.2rem;
+  right: auto;
+}
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
+  right: 1rem;
+}
+.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-selection__clear {
+  left: 1rem;
+  right: auto;
+}
 .select2-container--bootstrap.select2-container--disabled .select2-selection {
   border-color: #ccc;
   -webkit-box-shadow: none;
@@ -282,9 +300,8 @@
   line-height: 1.428571429;
   list-style: none;
   margin: 0;
-  overflow: hidden;
   padding: 0;
-  width: 100%;
+  overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
@@ -312,11 +329,17 @@
   min-width: 5em;
 }
 .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice__remove {
+  border: none;
+  background: none;
+  box-shadow: none;
+  outline: none;
   color: #999;
   cursor: pointer;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 700;
   margin-right: 3px;
+  font-size: 1rem;
+  line-height: 1.2rem;
 }
 .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice__remove:hover {
   color: #333;