Updates to release v2.1.6 fix #298 fix #289

kartik-v · Nov 1, 2019 · 6a1a5e4 · 6a1a5e4
1 parent 91a9095
commit 6a1a5e4
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 23 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,12 @@
 Change Log: `yii2-widget-select2`
 =================================
 
+## Version 2.1.6
+
+**Date:** 01-Nov-2019
+
+- (enh #298, #289): Fix empty options when placeholder is set.
+
 ## Version 2.1.5
 
 **Date:** 31-Oct-2019

diff --git a/src/Select2.php b/src/Select2.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;
@@ -236,16 +236,17 @@ public function renderWidget()
         if (empty($this->data)) {
             $emptyValue = !isset($this->value) || $this->value === '';
             $emptyInitText = !isset($this->initValueText) || $this->initValueText === '';
+            $emptyPH = !isset($this->pluginOptions['placeholder']);
             if ($emptyValue && $emptyInitText) {
-                $this->data = ['' => ''];
+                $this->data = $emptyPH ? ['' => ''] : [];
             } else {
                 if ($multiple) {
                     $key = !$emptyValue && is_array($this->value) ? $this->value : [];
                 } else {
                     $key = !$emptyValue ? $this->value : '';
                 }
                 $val = !$emptyInitText ? $this->initValueText : $key;
-                $this->data = $multiple ? array_combine((array)$key, (array)$val) : [$key => $val];
+                $this->data = $multiple ? array_combine((array)$key, (array)$val) : (($emptyPH && $key !== '') ? [$key => $val] : []);
             }
         }
         $this->initLanguage('language', true);

diff --git a/src/Select2Asset.php b/src/Select2Asset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/Select2KrajeeAsset.php b/src/Select2KrajeeAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeAsset.php b/src/ThemeAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeBootstrapAsset.php b/src/ThemeBootstrapAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeClassicAsset.php b/src/ThemeClassicAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeDefaultAsset.php b/src/ThemeDefaultAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeKrajeeAsset.php b/src/ThemeKrajeeAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeKrajeeBs4Asset.php b/src/ThemeKrajeeBs4Asset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeMaterialAsset.php b/src/ThemeMaterialAsset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.5
+ * @version 2.1.6
  */
 
 namespace kartik\select2;
@@ -14,7 +14,7 @@
  *
  * @author Mohamad Faeez <[email protected]>
  * @modified Kartik Visweswaran <[email protected]>
- * @since 2.1.5
+ * @since 2.1.6
  */
 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.5
+ * @version 2.1.6
  *
  * 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.5
+ * @version 2.1.6
  *
  * Additional CSS for Select2 for extra functionalities added by Krajee
  *

diff --git a/src/assets/css/select2-krajee-bs4.css b/src/assets/css/select2-krajee-bs4.css
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version 2.1.5
+ * @version 2.1.6
  *
  * Krajee Bootstrap 4.x Theme for Select2
  *

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,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version 2.1.5
+ * @version 2.1.6
  *
  * 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,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version 2.1.5
+ * @version 2.1.6
  *
  * 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,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
- * @version 2.1.5
+ * @version 2.1.6
  *
  * 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