bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update jquery.uls from upstream to 40e67f5

Browse Source 
* 20d5e4 Some cleanup to the language filter
* bf0c55 Remove unwanted script related code in search method

And l10n updates.

Change-Id: Iad1bcf4dca611e2004d9fdec776dce14a5f669b2
This commit is contained in:
Niklas Laxström
2016-04-11 14:29:32 +02:00
parent 6733a951c1
commit 7ac7b6dde4
8 changed files with 165 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/jquery.uls/src/jquery.uls.core.js
View File

@@ -33,20 +33,18 @@
</div>\
</div>\
<div id="search" class="row uls-search"> \
<div class="one column">\
<div class="uls-search-wrapper"> \
<label class="uls-search-label" for="uls-languagefilter"></label>\
</div>\
<div class="ten columns">\
<div id="uls-search-input-block" class="uls-search-input-block">\
<input type="text" class="uls-filterinput uls-filtersuggestion" id="uls-filtersuggestion" disabled="true"\
autocomplete="off" /> <input type="text" class="uls-filterinput uls-languagefilter" id="uls-languagefilter"\
data-clear="uls-languagefilter-clear" data-suggestion="uls-filtersuggestion"\
placeholder="Language search" autocomplete="off" />\
<div class="uls-search-input-wrapper">\
<span id="uls-languagefilter-clear" class="uls-languagefilter-clear"></span>\
<input type="text" class="uls-filterinput uls-filtersuggestion"\
id="uls-filtersuggestion" disabled="true" autocomplete="off">\
<input type="text" class="uls-filterinput uls-languagefilter"\
id="uls-languagefilter" data-clear="uls-languagefilter-clear"\
data-suggestion="uls-filtersuggestion"\
placeholder="Language search" autocomplete="off">\
</div>\
</div>\
<div class="one column">\
<span id="uls-languagefilter-clear" class="uls-languagefilter-clear"></span>\
</div>\
</div>\
<div class="row uls-language-list"></div>\
<div class="row" id="uls-settings-block"></div>\

38
lib/jquery.uls/src/jquery.uls.languagefilter.js
View File

@@ -162,35 +162,25 @@
}
},
search: function() {
var languagesInScript,
query = $.trim( this.$element.val() ),
languages = $.uls.data.getLanguagesByScriptGroup( this.options.languages ),
scriptGroup, langNum, langCode;
search: function () {
var langCode,
query = $.trim( this.$element.val() );
this.resultCount = 0;
for ( scriptGroup in languages ) {
languagesInScript = languages[scriptGroup];
for ( langCode in this.options.languages ) {
if ( query === '' || this.filter( langCode, query ) ) {
if ( this.resultCount === 0 ) {
// Autofill the first result.
this.autofill( langCode );
}
languagesInScript.sort( $.uls.data.sortByAutonym );
if ( query.toLowerCase() === langCode ) {
this.selectedLanguage = langCode;
}
for ( langNum = 0; langNum < languagesInScript.length; langNum++ ) {
langCode = languagesInScript[langNum];
if ( query === '' || this.filter( langCode, query ) ) {
if ( this.resultCount === 0 ) {
// Autofill the first result.
this.autofill( langCode );
}
if ( query.toLowerCase() === langCode ) {
this.selectedLanguage = langCode;
}
if ( this.render( langCode ) ) {
this.resultCount++;
}
if ( this.render( langCode ) ) {
this.resultCount++;
}
}
}