Updates to release v2.1.5 fix #296 fix #298 fix #300

kartik-v · Oct 30, 2019 · fe0fffb · fe0fffb
1 parent 99dbf30
commit fe0fffb
Show file tree

Hide file tree

Showing 21 changed files with 236 additions and 205 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,15 @@
 Change Log: `yii2-widget-select2`
 =================================
 
+## Version 2.1.5
+
+**Date:** _under development_
+
+- (enh #300): Add Material Theme.
+- (enh #299): Add Czech Translations.
+- (enh #298, #289): Fix empty options.
+- (enh #296): Change source input display from none to intelligent visibility hidden.
+
 ## Version 2.1.4
 
 **Date:** 02-Sep-2019

diff --git a/src/Select2.php b/src/Select2.php
@@ -4,13 +4,14 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
 use kartik\base\AddonTrait;
 use kartik\base\InputWidget;
+use ReflectionException;
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\helpers\Html;
@@ -65,7 +66,7 @@ class Select2 extends InputWidget
      */
     const THEME_KRAJEE_BS4 = 'krajee-bs4';
     /**
-     * Select2 Material by Faeez
+     * Select2 Material Theme
      */
     const THEME_MATERIAL = 'material';
 
@@ -196,8 +197,8 @@ class Select2 extends InputWidget
 
     /**
      * @inheritdoc
-     * @throws \ReflectionException
-     * @throws \yii\base\InvalidConfigException
+     * @throws ReflectionException
+     * @throws InvalidConfigException
      */
     public function run()
     {
@@ -207,8 +208,8 @@ public function run()
 
     /**
      * Initializes and renders the widget
-     * @throws \ReflectionException
-     * @throws \yii\base\InvalidConfigException
+     * @throws ReflectionException
+     * @throws InvalidConfigException
      */
     public function renderWidget()
     {
@@ -232,17 +233,19 @@ public function renderWidget()
             $this->pluginOptions['minimumResultsForSearch'] = new JsExpression('Infinity');
         }
         $this->initPlaceholder();
-        if (!isset($this->data)) {
-            if (!isset($this->value) && !isset($this->initValueText)) {
+        if (empty($this->data)) {
+            $emptyValue = !isset($this->value) || $this->value === '';
+            $emptyInitText = !isset($this->initValueText) || $this->initValueText === '';
+            if ($emptyValue && $emptyInitText) {
                 $this->data = [];
             } else {
                 if ($multiple) {
-                    $key = isset($this->value) && is_array($this->value) ? $this->value : [];
+                    $key = !$emptyValue && is_array($this->value) ? $this->value : [];
                 } else {
-                    $key = isset($this->value) ? $this->value : '';
+                    $key = !$emptyValue ? $this->value : '';
                 }
-                $val = isset($this->initValueText) ? $this->initValueText : $key;
-                $this->data = $multiple ? array_combine((array) $key, (array) $val) : [$key => $val];
+                $val = !$emptyInitText ? $this->initValueText : $key;
+                $this->data = $multiple ? array_combine((array)$key, (array)$val) : [$key => $val];
             }
         }
         $this->initLanguage('language', true);
@@ -253,7 +256,7 @@ public function renderWidget()
 
     /**
      * Initializes and render the toggle all button
-     * @throws \yii\base\InvalidConfigException
+     * @throws InvalidConfigException
      */
     protected function renderToggleAll()
     {
@@ -366,7 +369,7 @@ protected function renderInput()
     {
         if ($this->pluginLoading) {
             $this->_loadIndicator = '<div class="kv-plugin-loading loading-' . $this->options['id'] . '">&nbsp;</div>';
-            Html::addCssStyle($this->options, 'display:none');
+            Html::addCssStyle($this->options, ['width' => '1px', 'height' => '1px', 'visibility' => 'hidden']);
         }
         Html::addCssClass($this->options, 'form-control');
         $input = $this->getInput('dropDownList', 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.4
+ * @version 2.1.5
  */
 
 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.4
+ * @version 2.1.5
  */
 
 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.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;

diff --git a/src/ThemeBootstrapAsset.php b/src/ThemeBootstrapAsset.php
@@ -4,13 +4,11 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
-use kartik\base\AssetBundle;
-
 /**
  * Asset bundle for the bootstrap theme for [[Select2]] widget.
  *

diff --git a/src/ThemeClassicAsset.php b/src/ThemeClassicAsset.php
@@ -4,13 +4,11 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
-use kartik\base\AssetBundle;
-
 /**
  * Asset bundle for the classic theme for [[Select2]] widget.
  *

diff --git a/src/ThemeDefaultAsset.php b/src/ThemeDefaultAsset.php
@@ -4,13 +4,11 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
-use kartik\base\AssetBundle;
-
 /**
  * Asset bundle for the default inbuilt theme for [[Select2]] widget.
  *

diff --git a/src/ThemeKrajeeAsset.php b/src/ThemeKrajeeAsset.php
@@ -4,13 +4,11 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
-use kartik\base\AssetBundle;
-
 /**
  * Asset bundle for the Krajee theme for [[Select2]] widget.
  *

diff --git a/src/ThemeKrajeeBs4Asset.php b/src/ThemeKrajeeBs4Asset.php
@@ -4,13 +4,11 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
-use kartik\base\AssetBundle;
-
 /**
  * Asset bundle for the Krajee theme for [[Select2]] widget.
  *

diff --git a/src/ThemeMaterialAsset.php b/src/ThemeMaterialAsset.php
@@ -4,18 +4,17 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2019
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.4
+ * @version 2.1.5
  */
 
 namespace kartik\select2;
 
-use kartik\base\AssetBundle;
-
 /**
  * Asset bundle for the Krajee theme for [[Select2]] widget.
  *
  * @author Mohamad Faeez <mfmdevsystem@gmail.com>
- * @since 1.0
+ * @modified Kartik Visweswaran <kartikv2@gmail.com>
+ * @since 2.1.5
  */
 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.4
+ * @version 2.1.5
  *
  * 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.4
+ * @version 2.1.5
  *
  * 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.4
+ * @version 2.1.5
  *
  * 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.4
+ * @version 2.1.5
  *
  * 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