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

Loop optimization and cleanup

Browse Source 
Reduced the complexity of search loops
And some cleanup.

Change-Id: I772b02abd14d50ad1965e933d8dbb6d3eb4e0b1d
This commit is contained in:
Santhosh Thottingal
2012-07-25 12:20:22 +05:30
committed by Amir E. Aharoni
parent 05eb91bee3
commit af3f6ac58d
3 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/ext.uls.data.utils.js
View File

@@ -35,7 +35,7 @@
* @return array of strings * @return array of strings
*/ */
$.uls.data.regions = function( language ) { $.uls.data.regions = function( language ) {
return $.uls.data.languages[language][1]; return ( $.uls.data.languages[language] && $.uls.data.languages[language][1] ) || 'UNKNOWN';
}; };
/** /**
@@ -169,6 +169,27 @@
return $.uls.data.languagesByScriptGroupInRegions( $.uls.data.allRegions() ); return $.uls.data.languagesByScriptGroupInRegions( $.uls.data.allRegions() );
}; };
/**
* Get the given list of languages sorted by script.
* @param languages Array of language codes
* @return {Object} Array of languages indexed by script codes
*/
$.uls.data.languagesByScriptGroup = function( languages ) {
var languagesByScriptGroup = {}, scriptGroup, language, langScriptGroup;
for ( scriptGroup in $.uls.data.scriptgroups ) {
for ( language in languages ) {
langScriptGroup = $.uls.data.scriptGroupOfLanguage( language );
if( langScriptGroup !== scriptGroup ){
continue;
}
if ( !languagesByScriptGroup[scriptGroup] ) {
languagesByScriptGroup[scriptGroup] = [];
}
languagesByScriptGroup[scriptGroup].push( language );
}
}
return languagesByScriptGroup;
};
/** /**
* Returns an associative array of languages in several regions, * Returns an associative array of languages in several regions,
* grouped by script group. * grouped by script group.

71
resources/ext.uls.languagefilter.js
View File

@@ -48,23 +48,20 @@
}, },
search: function() { search: function() {
var that = this; var query = $.trim( this.$element.val() ),
var languages = this.options.languages; languages = $.uls.data.languagesByScriptGroup( this.options.languages ),
var query = this.$element.val(); scriptGroup, langNum, langCode;
var allLanguages = $.uls.data.allLanguagesByScriptGroup(); for ( scriptGroup in languages ) {
for ( var scriptGroup in allLanguages ) { for ( langNum = 0; langNum < languages[scriptGroup].length; langNum++ ) {
for ( var langNum = 0; langNum < allLanguages[scriptGroup].length; langNum++ ) { langCode = languages[scriptGroup][langNum];
var langCode = allLanguages[scriptGroup][langNum]; if ( query === "" || this.filter( langCode, query ) ) {
if ( languages[langCode] !== undefined && ( query === "" || that.filter( langCode, query ) ) ) this.render( langCode );
{
that.render( langCode );
} }
} }
} }
}, },
render: function( langCode ) { render: function( langCode ) {
var that = this;
var $target = this.options.$target; var $target = this.options.$target;
if ( !$target ) { if ( !$target ) {
return; return;
@@ -86,8 +83,8 @@
*/ */
filter: function( langCode, searchTerm ) { filter: function( langCode, searchTerm ) {
// FIXME script is ISO 15924 code. We might need actual name of script. // FIXME script is ISO 15924 code. We might need actual name of script.
var matcher = new RegExp( this.escapeRegex( searchTerm ), 'i' ); var matcher = new RegExp( this.escapeRegex( searchTerm ), 'i' ),
var languageName = this.options.languages[langCode]; languageName = this.options.languages[langCode];
return matcher.test( languageName ) || return matcher.test( languageName ) ||
matcher.test( $.uls.data.autonym( langCode ) ) || matcher.test( $.uls.data.autonym( langCode ) ) ||
matcher.test( langCode ) || matcher.test( langCode ) ||
@@ -138,41 +135,38 @@
constructor: RegionSelector, constructor: RegionSelector,
test: function( langCode ) { test: function( langCode ) {
var that = this, var regions = $.uls.data.regionsInGroup( this.regionGroup ),
regionGroups = $.uls.data.regiongroups, langRegions = $.uls.data.regions( langCode ),
regions = $.uls.data.regions( langCode ); region;
// 1. loop over all regiongroups - like {EU: 2, AF: 2, AS: 3 ...} for ( var i = 0; i < regions.length; i++ ) {
// 2. check that the region matches the active region group region = regions[i];
// 3. if this language is included in that region, show it if ( $.inArray( region, langRegions ) >= 0 ) {
// 4. if none of the conditions match, the language is not shown this.render( langCode, region );
$.each( regionGroups, function( region, regionGroup) {
if ( regionGroup === that.regionGroup && $.inArray( region, regions ) >= 0 ) {
that.render( langCode, region );
return; return;
} }
} ); }
}, },
show: function() { show: function() {
var that = this; var i, regions, language, languagesByScriptGroup, scriptGroup, languages;
// Make the selected region (and it only) active // Make the selected region (and it only) active
$( '.regionselector' ).removeClass( 'active' ); $( '.regionselector' ).removeClass( 'active' );
that.$element.addClass( 'active' ); this.$element.addClass( 'active' );
// Repopulate the list of languages // Re-populate the list of languages
that.options.$target.empty(); this.options.$target.empty();
regions = $.uls.data.regionsInGroup( this.regionGroup );
var regions = $.uls.data.regionsInGroup( that.regionGroup ); languagesByScriptGroup = $.uls.data.languagesByScriptGroup( this.options.languages );
var languagesInRegion = $.uls.data.languagesByScriptGroupInRegions( regions ); for ( scriptGroup in languagesByScriptGroup ) {
for ( var scriptGroup in languagesInRegion ) { languages = languagesByScriptGroup[scriptGroup];
for ( var langNum = 0; langNum < languagesInRegion[scriptGroup].length; langNum++ ) { for ( i = 0; i < languages.length; i++) {
that.test( languagesInRegion[scriptGroup][langNum] ); language = languages[i];
this.test( language );
} }
} }
if ( that.options.callback ) { if ( this.options.callback ) {
that.options.callback.call(); this.options.callback.call();
} }
}, },
@@ -214,7 +208,8 @@
$.fn.regionselector.defaults = { $.fn.regionselector.defaults = {
$target: null, // Where to render the results. Must be a ul element $target: null, // Where to render the results. Must be a ul element
callback: null // Callback - will be called after results are displayed. callback: null, // Callback - will be called after results are displayed.
languages: null
}; };
$.fn.regionselector.Constructor = RegionSelector; $.fn.regionselector.Constructor = RegionSelector;

3
tests/qunit/ext.uls.tests.js
View File

@@ -43,7 +43,7 @@ test( "-- Initial check", function() {
} ); } );
test( "-- $.uls.data testing", function() { test( "-- $.uls.data testing", function() {
expect( 17 ); expect( 18 );
// This test assumes that we don't want any scripts to be in the 'Other' // This test assumes that we don't want any scripts to be in the 'Other'
// group. Actually, this may become wrong some day. // group. Actually, this may become wrong some day.
@@ -61,6 +61,7 @@ test( "-- $.uls.data testing", function() {
strictEqual( $.uls.data.script( 'ii' ), 'Yiii', 'Correct script of the Yi language was selected' ); strictEqual( $.uls.data.script( 'ii' ), 'Yiii', 'Correct script of the Yi language was selected' );
deepEqual( $.uls.data.regions( 'lzz' ), [ 'EU', 'ME' ], 'Correct regions of the Laz language were selected' ); deepEqual( $.uls.data.regions( 'lzz' ), [ 'EU', 'ME' ], 'Correct regions of the Laz language were selected' );
strictEqual( $.uls.data.regions( 'no-such-language' ), 'UNKNOWN', "The region of an invalid language is 'UNKNOWN'" );
var allLanguagesByRegionAndScript = $.uls.data.allLanguagesByRegionAndScript(); var allLanguagesByRegionAndScript = $.uls.data.allLanguagesByRegionAndScript();
deepEqual( allLanguagesByRegionAndScript['3']['AS']['SouthEastAsian']['Bugi'], ['bug'], 'All languages in the Buginese script in Asia were selected' ); deepEqual( allLanguagesByRegionAndScript['3']['AS']['SouthEastAsian']['Bugi'], ['bug'], 'All languages in the Buginese script in Asia were selected' );