Fixed unit test issue and typo in Norwegian translation
This commit is contained in:
parent
45ee7340e5
commit
bca6a50331
4
src/js/select2/i18n/nb.js
vendored
4
src/js/select2/i18n/nb.js
vendored
@ -12,9 +12,7 @@ define(function () {
|
|||||||
inputTooShort: function (args) {
|
inputTooShort: function (args) {
|
||||||
var remainingChars = args.minimum - args.input.length;
|
var remainingChars = args.minimum - args.input.length;
|
||||||
|
|
||||||
var message = 'Vennligst skriv inn ' + remainingChars + ' tegn til';
|
return 'Vennligst skriv inn ' + remainingChars + ' tegn til';
|
||||||
|
|
||||||
return message + ' tegn til';
|
|
||||||
},
|
},
|
||||||
loadingMore: function () {
|
loadingMore: function () {
|
||||||
return 'Laster flere resultater…';
|
return 'Laster flere resultater…';
|
||||||
|
6
src/js/select2/selection/search.js
vendored
6
src/js/select2/selection/search.js
vendored
@ -175,7 +175,13 @@ define([
|
|||||||
|
|
||||||
this.resizeSearch();
|
this.resizeSearch();
|
||||||
if (searchHadFocus) {
|
if (searchHadFocus) {
|
||||||
|
var isTagInput = this.$element.find('[data-select2-tag]').length;
|
||||||
|
if (isTagInput) {
|
||||||
|
// fix IE11 bug where tag input lost focus
|
||||||
this.$element.focus();
|
this.$element.focus();
|
||||||
|
} else {
|
||||||
|
this.$search.focus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user