fixes select2#3663

LOK-Soft · Aug 31, 2018 · caeb650 · caeb650
1 parent d1a5715
commit caeb650
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/dist/js/i18n/sq.js b/dist/js/i18n/sq.js
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -1470,9 +1470,13 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      // Only focus if preCloseFocus and afterCloseFocus are the same
+      // (selection or closing by keyboard)
+      var preCloseFocus = window.document.activeElement;
       window.setTimeout(function () {
-        self.$selection.focus();
+        if(preCloseFocus === window.document.activeElement) {
+          self.$selection.focus();
+        }
       }, 0);
 
       self._detachCloseHandler(container);

diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js
diff --git a/dist/js/select2.js b/dist/js/select2.js
@@ -1470,9 +1470,13 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      // Only focus if preCloseFocus and afterCloseFocus are the same
+      // (selection or closing by keyboard)
+      var preCloseFocus = window.document.activeElement;
       window.setTimeout(function () {
-        self.$selection.focus();
+        if(preCloseFocus === window.document.activeElement) {
+          self.$selection.focus();
+        }
       }, 0);
 
       self._detachCloseHandler(container);

diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/src/js/select2/selection/base.js b/src/js/select2/selection/base.js
@@ -81,9 +81,13 @@ define([
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      // Only focus if preCloseFocus and afterCloseFocus are the same
+      // (selection or closing by keyboard)
+      var preCloseFocus = window.document.activeElement;
       window.setTimeout(function () {
-        self.$selection.focus();
+        if(preCloseFocus === window.document.activeElement) {
+          self.$selection.focus();
+        }
       }, 0);
 
       self._detachCloseHandler(container);