Updates to release v2.1.4 fix #168 fix #236 fix #247 fix #253

kartik-v · Dec 11, 2018 · dd09e46 · dd09e46
1 parent 2bbb9ca
commit dd09e46
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 17 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -5,6 +5,7 @@ Change Log: `yii2-widget-select2`
 
 **Date:** _under development_
 
+- (enh #168, #236, #246, #247, #253): Proper revert of behavior for select all toggle visibility.
 - Update README.
 - (enh #275): Add Hebrew Translations.
 - (enh #272): Update Greek Translations.

diff --git a/src/Select2.php b/src/Select2.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 namespace kartik\select2;
@@ -253,7 +253,8 @@ public function renderWidget()
     protected function renderToggleAll()
     {
         // disable select all toggle feature for a single select, or when the showToggleALl is false, or
-        if (!$this->options['multiple'] || !$this->showToggleAll) {
+        // when one is generating an ajax based search for rendering the select2 options
+        if (!$this->options['multiple'] || !$this->showToggleAll || !empty($this->pluginOptions['ajax'])) {
             return;
         }
         $unchecked = '<i class="glyphicon glyphicon-unchecked"></i>';

diff --git a/src/Select2Asset.php b/src/Select2Asset.php
@@ -4,7 +4,7 @@
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 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 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 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 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 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 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 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 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 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 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 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 - 2018
  * @package yii2-widgets
  * @subpackage yii2-widget-select2
- * @version 2.1.3
+ * @version 2.1.4
  */
 
 namespace kartik\select2;

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 - 2018
- * @version 2.1.3
+ * @version 2.1.4
  *
  * 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 - 2018
- * @version 2.1.3
+ * @version 2.1.4
  *
  * 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 - 2018
- * @version 2.1.3
+ * @version 2.1.4
  *
  * 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 - 2018
- * @version 2.1.3
+ * @version 2.1.4
  *
  * 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/js/select2-krajee.js b/src/assets/js/select2-krajee.js
@@ -1,6 +1,6 @@
 /*!
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version 2.1.3
+ * @version 2.1.4
  *
  * 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