Updates to release v2.1.9 fix #325 fix #328 fix #330

CHANGE.md

@@ -3,9 +3,12 @@ Change Log: `yii2-widget-select2`
 
 ## Version 2.1.9
 
-**Date:** _under development_
+**Date:** 25-Sep-2020
 
+- (enh #330): Fix select all for option values containing hyphen.
 - (enh #329): Minor fixes to select2 krajee theme.
+- (enh #328): Fix undefined options in select all.
+- (enh #325): Use `hashVarLoadPosition` to initialize Select2 hash variable.
 
 ## Version 2.1.8
 

src/Select2.php

@@ -9,6 +9,7 @@
 
 namespace kartik\select2;
 
+use Exception;
 use kartik\base\AddonTrait;
 use kartik\base\InputWidget;
 use ReflectionException;
@@ -18,8 +19,8 @@
 use yii\helpers\Inflector;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
+use Yii\validators\RequiredValidator;
 use yii\web\JsExpression;
-use yii\web\View;
 
 /**
  * Select2 widget is a Yii2 wrapper for the Select2 jQuery plugin. This input widget is a jQuery based replacement for
@@ -33,6 +34,7 @@
 class Select2 extends InputWidget
 {
     use AddonTrait;
+
     /**
      * Select2 large input size
      */
@@ -210,6 +212,7 @@ public function run()
      * Initializes and renders the widget
      * @throws ReflectionException
      * @throws InvalidConfigException
+     * @throws Exception
      */
     public function renderWidget()
     {
@@ -311,6 +314,7 @@ protected function renderToggleAll()
 
     /**
      * Initializes the placeholder for Select2
+     * @throws Exception
      */
     protected function initPlaceholder()
     {
@@ -338,6 +342,7 @@ protected function initPlaceholder()
      *
      * @return string
      * @throws InvalidConfigException
+     * @throws Exception
      */
     protected function embedAddon($input)
     {
@@ -432,14 +437,17 @@ public function registerAssets()
         $this->_s2OptionsVar = 's2options_' . hash('crc32', $options);
         $this->options['data-s2-options'] = $this->_s2OptionsVar;
         $view = $this->getView();
-        $view->registerJs("var {$this->_s2OptionsVar} = {$options};", View::POS_HEAD);
+        $view->registerJs("var {$this->_s2OptionsVar} = {$options};", $this->hashVarLoadPosition);
         if ($this->maintainOrder) {
             $val = Json::encode(is_array($this->value) ? $this->value : [$this->value]);
             $view->registerJs("initS2Order('{$id}',{$val});");
         }
         $this->registerPlugin($this->pluginName, "jQuery('#{$id}')", "initS2Loading('{$id}','{$this->_s2OptionsVar}')");
     }
-
+
+    /**
+     * @return bool
+     */
     protected function isRequired()
     {
         if (!empty($this->options['required'])) {
@@ -448,9 +456,9 @@ protected function isRequired()
         if (!$this->hasModel()) {
             return false;
         }
-        $validators = $this->model->getValidators($this->attribute);
+        $validators = $this->model->getActiveValidators($this->attribute);
         foreach ($validators as $validator) {
-            if ($validator instanceof yii\validators\RequiredValidator) {
+            if ($validator instanceof RequiredValidator) {
                 return true;
             }
         }

src/assets/css/select2-krajee-bs4.css

@@ -384,6 +384,7 @@
 /**
  * Bootstrap validation states
  */
+select.is-invalid + .select2-container--krajee-bs4 .select2-selection--single,
 .has-error.select2-container--krajee-bs4 .select2-dropdown,
 .has-error .select2-container--krajee-bs4 .select2-selection {
     border-color: #dc3545;
@@ -395,6 +396,7 @@
     border-color: #dc3545;
 }
 
+select.is-valid + .select2-container--krajee-bs4 .select2-selection--single,
 .has-success.select2-container--krajee-bs4 .select2-dropdown,
 .has-success .select2-container--krajee-bs4 .select2-selection {
     border-color: #28a745;

src/assets/js/select2-krajee.js

@@ -38,13 +38,16 @@ var initS2ToggleAll = function () {
         }
         listenTogAll = function () {
             $tog.off('.krajees2').on('click.krajees2', function () {
-                var isSelect = $tog.hasClass('s2-togall-select'), ev = 'selectall', val;
+                var isSelect = $tog.hasClass('s2-togall-select'), ev = 'selectall', opts, val;
                 if (!isSelect) {
                     ev = 'unselectall';
                 }
                 $('#select2-' + id + '-results .select2-results__option[role="option"]').each(function () {
-                    val = $(this).attr('id').split('-').pop();
-                    $el.find('option:not([disabled])[value="' + val + '"]').prop('selected', !!isSelect);
+                    opts = $(this).attr('id').match(/^select2-[^-]*-result-.{4}-(.*)$/);
+                    if (opts.length && opts[1]) {
+                        val = opts[1];
+                        $el.find('option:not([disabled])[value="' + val + '"]').prop('selected', !!isSelect);
+                    }
                 });
                 $el.select2('close').trigger('krajeeselect2:' + ev).trigger('change');
             });
@@ -102,10 +105,13 @@ var initS2ToggleAll = function () {
         }
     };
     initS2Unselect = function () {
-        var $el = $(this), opts = $el.data('select2').options;
-        opts.set('disabled', true);
+        var $el = $(this), select2 = $el.data('select2');
+        if (!select2 || !select2.options) {
+            return;
+        }
+        select2.options.set('disabled', true);
         setTimeout(function () {
-            opts.set('disabled', false);
+            select2.options.set('disabled', false);
             $el.trigger('krajeeselect2:cleared');
         }, 1);
     };
@@ -169,7 +175,7 @@ var initS2ToggleAll = function () {
         setTimeout(function () {
             if ($el.attr('multiple') && $el.attr('dir') === 'rtl') {
                 $el.parent().find('.select2-search__field').css({width: '100%', direction: 'rtl'});
-                $el.parent().find('.select2-search--inline').css({float: 'none'});
+                $el.parent().find('.select2-search--inline').css({"float": "none"});
             }
         }, 100);
     };