Fixed unit test issue and typo in Norwegian translation

select2 · Oct 27, 2017 · bca6a50 · bca6a50
1 parent 45ee734
commit bca6a50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/js/select2/i18n/nb.js b/src/js/select2/i18n/nb.js
@@ -12,9 +12,7 @@ define(function () {
     inputTooShort: function (args) {
       var remainingChars = args.minimum - args.input.length;
 
-      var message = 'Vennligst skriv inn ' + remainingChars + ' tegn til';
-
-      return message + ' tegn til';
+      return 'Vennligst skriv inn ' + remainingChars + ' tegn til';
     },
     loadingMore: function () {
       return 'Laster flere resultater…';

diff --git a/src/js/select2/selection/search.js b/src/js/select2/selection/search.js
@@ -175,7 +175,13 @@ define([
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$element.focus();
+      var isTagInput = this.$element.find('[data-select2-tag]').length;
+      if (isTagInput) {
+        // fix IE11 bug where tag input lost focus
+        this.$element.focus();
+      } else {
+        this.$search.focus();
+      }
     }
   };