From de59121491c454fa7da3c61823f8aee3847f38ea Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Sat, 13 Jun 2020 14:08:11 +0200
Subject: [PATCH] Bug 25727: Fix default values

The way we defined the default values does not longer work (?)
Using
  $.fn.select2.defaults.set
instead of
  jQuery.extend($.fn.select2.defaults, {
fixes the problem.

It restores the allowClear setting.

There is a change in the behavior here, the selection opens when the
clear button is clicked. That is coming from a change in Select2
apparently. We may want to hack something to restore the precedent
behaviour.

This patch also removes the redefinition of the width. It seems that the
issue that this code was trying to correct is now fixed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../intranet-tmpl/prog/en/includes/select2.inc     | 27 ++++------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
index e51ebfd849..dd1df60214 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/select2.inc
@@ -5,27 +5,11 @@
 [% Asset.css("css/select2.css") | $raw %]
 <!-- select2.inc -->
 <script>
-  jQuery.extend($.fn.select2.defaults, {
-    allowClear: true,
-    width: function() {
-      var width = this.element.outerWidth();
+  $.fn.select2.defaults.set("allowClear", true);
+  $.fn.select2.defaults.set("placeholder", "");
 
-      // 18 is the width of .select2-arrow
-      width -= 18;
-
-      if (this.allowClear) {
-        // 42 is the margin-right of .select2-chosen when allowClear is true
-        width += 42;
-      } else {
-        // 26 is the margin-right of .select2-chosen when allowClear is false
-        width += 26;
-      }
-
-      return width;
-    },
-
-    // Internationalization
-    language: {
+  // Internationalization
+  $.fn.select2.defaults.set("language", {
       errorLoading:function(){return"The results could not be loaded."},
       inputTooLong:function(e){
           var n = e.input.length - e.max;
@@ -46,7 +30,6 @@
       searching:function(){return _("Searching…")},
       removeAllItems:function(){return _("Remove all items")},
       removeItem:function(){return _("Remove item")}
-    }
-  });
+    });
 </script>
 <!-- / select2.inc -->
-- 
2.11.0