1
0
mirror of synced 2024-11-22 13:06:08 +03:00

Fixed unit test issue and typo in Norwegian translation

This commit is contained in:
Tore Olav Kristiansen 2017-10-27 16:16:08 +02:00 committed by alexweissman
parent 45ee7340e5
commit bca6a50331
2 changed files with 8 additions and 4 deletions

View File

@ -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…';

View File

@ -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();
}
}
};