Merge pull request #74 from amire80/coding_conventions

Coding conventions, cleanup
This commit is contained in:
Siebrand Mazeland
2013-02-07 21:01:24 -08:00
5 changed files with 184 additions and 150 deletions

View File

@@ -22,6 +22,7 @@
'use strict'; 'use strict';
// Region numbers in id attributes also appear in the langdb. // Region numbers in id attributes also appear in the langdb.
/*jshint multistr:true */
var template = '\ var template = '\
<div class="grid uls-menu uls-wide"> \ <div class="grid uls-menu uls-wide"> \
<div class="row"> \ <div class="row"> \
@@ -74,15 +75,17 @@
<div class="row uls-language-list"></div>\ <div class="row uls-language-list"></div>\
<div class="row" id="settings-block"></div>\ <div class="row" id="settings-block"></div>\
</div> '; </div> ';
/*jshint multistr:false */
/** /**
* ULS Public class definition * ULS Public class definition
*/ */
var ULS = function( element, options ) { var ULS = function ( element, options ) {
this.$element = $( element ); this.$element = $( element );
this.options = $.extend( {}, $.fn.uls.defaults, options ); this.options = $.extend( {}, $.fn.uls.defaults, options );
this.$menu = $( template ); this.$menu = $( template );
this.languages = this.options.languages; this.languages = this.options.languages;
for ( var code in this.languages ) { for ( var code in this.languages ) {
if ( $.uls.data.languages[code] === undefined ) { if ( $.uls.data.languages[code] === undefined ) {
if ( window.console && window.console.log ) { if ( window.console && window.console.log ) {
@@ -91,13 +94,16 @@
delete this.languages[code]; delete this.languages[code];
} }
} }
this.left = this.options.left; this.left = this.options.left;
this.top = this.options.top; this.top = this.options.top;
this.shown = false; this.shown = false;
this.initialized = false; this.initialized = false;
this.$languageFilter = this.$menu.find( '#languagefilter' ); this.$languageFilter = this.$menu.find( '#languagefilter' );
this.$regionFilters = this.$menu.find( '.uls-region' ); this.$regionFilters = this.$menu.find( '.uls-region' );
this.$resultsView = this.$menu.find( 'div.uls-language-list' ); this.$resultsView = this.$menu.find( 'div.uls-language-list' );
this.render(); this.render();
this.listen(); this.listen();
this.ready(); this.ready();
@@ -106,7 +112,7 @@
ULS.prototype = { ULS.prototype = {
constructor: ULS, constructor: ULS,
ready: function() { ready: function () {
if ( this.options.onReady ) { if ( this.options.onReady ) {
this.options.onReady.call( this ); this.options.onReady.call( this );
} }
@@ -117,7 +123,7 @@
* Returns an object with top and left properties. * Returns an object with top and left properties.
* @returns {Object} * @returns {Object}
*/ */
position: function() { position: function () {
var pos = $.extend( {}, this.$element.offset(), { var pos = $.extend( {}, this.$element.offset(), {
height: this.$element[0].offsetHeight height: this.$element[0].offsetHeight
} ); } );
@@ -130,7 +136,7 @@
/** /**
* Show the ULS window * Show the ULS window
*/ */
show: function() { show: function () {
var pos = this.position(); var pos = this.position();
this.$menu.css( { this.$menu.css( {
top: pos.top, top: pos.top,
@@ -157,7 +163,7 @@
} }
}, },
i18n: function() { i18n: function () {
if ( $.i18n ) { if ( $.i18n ) {
this.$menu.find( '[data-i18n]' ).i18n(); this.$menu.find( '[data-i18n]' ).i18n();
this.$languageFilter.prop( 'placeholder', $.i18n( 'uls-search-placeholder' ) ); this.$languageFilter.prop( 'placeholder', $.i18n( 'uls-search-placeholder' ) );
@@ -177,7 +183,7 @@
/** /**
* Hide the ULS window * Hide the ULS window
*/ */
hide: function() { hide: function () {
this.$menu.hide(); this.$menu.hide();
this.shown = false; this.shown = false;
}, },
@@ -186,29 +192,28 @@
* Render the UI elements. * Render the UI elements.
* Does nothing by default. Can be used for customization. * Does nothing by default. Can be used for customization.
*/ */
render: function() { render: function () {
// Rendering stuff here // Rendering stuff here
}, },
/** /**
* callback for no results found context. * Callback for no results found context.
* @param search string The search term
*/ */
noresults: function( search ) { noresults: function () {
this.$resultsView.lcd( 'noResults' ); this.$resultsView.lcd( 'noResults' );
}, },
/** /**
* callback for results found context. * callback for results found context.
*/ */
success: function() { success: function () {
this.$resultsView.show(); this.$resultsView.show();
}, },
/** /**
* Bind the UI elements with their event listeners * Bind the UI elements with their event listeners
*/ */
listen: function() { listen: function () {
var lcd, var lcd,
uls = this; uls = this;
@@ -227,6 +232,7 @@
// Handle key press events on the menu // Handle key press events on the menu
uls.$menu.on( 'keypress', $.proxy( this.keypress, this ) ) uls.$menu.on( 'keypress', $.proxy( this.keypress, this ) )
.on( 'keyup', $.proxy( this.keyup, this ) ); .on( 'keyup', $.proxy( this.keyup, this ) );
if ( this.eventSupported( 'keydown' ) ) { if ( this.eventSupported( 'keydown' ) ) {
this.$menu.on( 'keydown', $.proxy( this.keypress, this ) ); this.$menu.on( 'keydown', $.proxy( this.keypress, this ) );
} }
@@ -243,11 +249,11 @@
uls.$languageFilter.languagefilter( { uls.$languageFilter.languagefilter( {
$target: lcd, $target: lcd,
languages: uls.languages, languages: uls.languages,
success: function() { success: function () {
$( '.regionselector' ).removeClass( 'active' ); $( '.regionselector' ).removeClass( 'active' );
uls.success(); uls.success();
}, },
noresults: function() { noresults: function () {
$( '.regionselector' ).removeClass( 'active' ); $( '.regionselector' ).removeClass( 'active' );
uls.noresults(); uls.noresults();
}, },
@@ -259,17 +265,19 @@
this.$menu.find( '.uls-region, .uls-region-link' ).regionselector( { this.$menu.find( '.uls-region, .uls-region-link' ).regionselector( {
$target: lcd, $target: lcd,
languages: uls.languages, languages: uls.languages,
success: function( regionfilter ) { success: function ( regionfilter ) {
// Deactivate search filtering // Deactivate search filtering
uls.$languageFilter.languagefilter( 'deactivate' ); uls.$languageFilter.languagefilter( 'deactivate' );
// If it is WW region, show the quicklist
// If it is the WW region, show the quicklist
if ( regionfilter.regionGroup === 1 ) { if ( regionfilter.regionGroup === 1 ) {
lcd.quicklist(); lcd.quicklist();
} }
// Show 'results view' if we are in no results mode // Show 'results view' if we are in no results mode
uls.success(); uls.success();
}, },
noresults: function() { noresults: function () {
uls.$languageFilter.languagefilter( 'clear' ); uls.$languageFilter.languagefilter( 'clear' );
} }
} ); } );
@@ -279,8 +287,9 @@
* On select handler for search results * On select handler for search results
* @param langCode * @param langCode
*/ */
select: function( langCode ) { select: function ( langCode ) {
this.hide(); this.hide();
if ( this.options.onSelect ) { if ( this.options.onSelect ) {
this.options.onSelect.call( this, langCode ); this.options.onSelect.call( this, langCode );
} }
@@ -289,17 +298,19 @@
/** /**
* On cancel handler for the uls menu * On cancel handler for the uls menu
*/ */
cancel: function() { cancel: function () {
this.hide(); this.hide();
if ( this.options.onCancel ) { if ( this.options.onCancel ) {
this.options.onCancel.call( this ); this.options.onCancel.call( this );
} }
}, },
keyup: function( e ) { keyup: function ( e ) {
if ( !this.shown ) { if ( !this.shown ) {
return; return;
} }
if ( e.keyCode === 27 ) { // escape if ( e.keyCode === 27 ) { // escape
this.cancel(); this.cancel();
e.preventDefault(); e.preventDefault();
@@ -307,10 +318,11 @@
} }
}, },
keypress: function( e ) { keypress: function ( e ) {
if ( !this.shown ) { if ( !this.shown ) {
return; return;
} }
if ( e.keyCode === 27 ) { // escape if ( e.keyCode === 27 ) { // escape
this.cancel(); this.cancel();
e.preventDefault(); e.preventDefault();
@@ -318,9 +330,10 @@
} }
}, },
click: function( e ) { click: function ( e ) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
if ( this.shown ) { if ( this.shown ) {
this.hide(); this.hide();
} else { } else {
@@ -335,6 +348,7 @@
this.$element.setAttribute( eventName, 'return;' ); this.$element.setAttribute( eventName, 'return;' );
isSupported = typeof this.$element[eventName] === 'function'; isSupported = typeof this.$element[eventName] === 'function';
} }
return isSupported; return isSupported;
}, },
@@ -346,8 +360,8 @@
/* ULS PLUGIN DEFINITION /* ULS PLUGIN DEFINITION
* =========================== */ * =========================== */
$.fn.uls = function( option ) { $.fn.uls = function ( option ) {
return this.each( function() { return this.each( function () {
var $this = $( this ), var $this = $( this ),
data = $this.data( 'uls' ), data = $this.data( 'uls' ),
options = typeof option === 'object' && option; options = typeof option === 'object' && option;
@@ -355,6 +369,7 @@
if ( !data ) { if ( !data ) {
$this.data( 'uls', ( data = new ULS( this, options ) ) ); $this.data( 'uls', ( data = new ULS( this, options ) ) );
} }
if ( typeof option === 'string' ) { if ( typeof option === 'string' ) {
data[option](); data[option]();
} }
@@ -372,23 +387,10 @@
}; };
// Define a dummy i18n function, if jquery.i18n not integrated. // Define a dummy i18n function, if jquery.i18n not integrated.
if( !$.fn.i18n ) { if ( !$.fn.i18n ) {
$.fn.i18n = function( option ) { $.fn.i18n = function () {
}; };
} }
$.fn.uls.Constructor = ULS; $.fn.uls.Constructor = ULS;
// Private utility functions
function getObjectLength ( obj ) {
var k, count = 0;
for ( k in obj ) {
if ( obj.hasOwnProperty( k ) ) {
count++;
}
}
return count;
}
} ( jQuery ) ); } ( jQuery ) );

View File

@@ -80,9 +80,10 @@
* @return array * @return array
*/ */
$.uls.data.getAutonyms = function () { $.uls.data.getAutonyms = function () {
var autonymsByCode = {}; var language,
autonymsByCode = {};
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( $.uls.data.isRedirect( language ) ) { if ( $.uls.data.isRedirect( language ) ) {
continue; continue;
} }
@@ -98,9 +99,10 @@
* @return array * @return array
*/ */
$.uls.data.getAllRegions = function () { $.uls.data.getAllRegions = function () {
var allRegions = []; var region,
allRegions = [];
for ( var region in $.uls.data.regiongroups ) { for ( region in $.uls.data.regiongroups ) {
allRegions.push( region ); allRegions.push( region );
} }
@@ -123,14 +125,15 @@
* @return array of strings (languages codes) * @return array of strings (languages codes)
*/ */
$.uls.data.getLanguagesInScripts = function ( scripts ) { $.uls.data.getLanguagesInScripts = function ( scripts ) {
var languagesInScripts = []; var language, i,
languagesInScripts = [];
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( $.uls.data.isRedirect( language ) ) { if ( $.uls.data.isRedirect( language ) ) {
continue; continue;
} }
for ( var i = 0; i < scripts.length; i++ ) { for ( i = 0; i < scripts.length; i++ ) {
if ( scripts[i] === $.uls.data.getScript( language ) ) { if ( scripts[i] === $.uls.data.getScript( language ) ) {
languagesInScripts.push( language ); languagesInScripts.push( language );
break; break;
@@ -156,14 +159,15 @@
* @return array of strings (languages codes) * @return array of strings (languages codes)
*/ */
$.uls.data.getLanguagesInRegions = function ( regions ) { $.uls.data.getLanguagesInRegions = function ( regions ) {
var languagesInRegions = []; var language, i,
languagesInRegions = [];
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( $.uls.data.isRedirect( language ) ) { if ( $.uls.data.isRedirect( language ) ) {
continue; continue;
} }
for ( var i = 0; i < regions.length; i++ ) { for ( i = 0; i < regions.length; i++ ) {
if ( $.inArray( regions[i], $.uls.data.getRegions( language ) ) !== -1 ) { if ( $.inArray( regions[i], $.uls.data.getRegions( language ) ) !== -1 ) {
languagesInRegions.push( language ); languagesInRegions.push( language );
break; break;
@@ -190,15 +194,16 @@
* @return associative array * @return associative array
*/ */
$.uls.data.getLanguagesByScriptInRegion = function ( region ) { $.uls.data.getLanguagesByScriptInRegion = function ( region ) {
var languagesByScriptInRegion = {}; var language, script,
languagesByScriptInRegion = {};
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( $.uls.data.isRedirect( language ) ) { if ( $.uls.data.isRedirect( language ) ) {
continue; continue;
} }
if ( $.inArray( region, $.uls.data.getRegions( language ) ) !== -1 ) { if ( $.inArray( region, $.uls.data.getRegions( language ) ) !== -1 ) {
var script = $.uls.data.getScript( language ); script = $.uls.data.getScript( language );
if ( languagesByScriptInRegion[script] === undefined ) { if ( languagesByScriptInRegion[script] === undefined ) {
languagesByScriptInRegion[script] = []; languagesByScriptInRegion[script] = [];
@@ -263,16 +268,17 @@
* @return associative array * @return associative array
*/ */
$.uls.data.getLanguagesByScriptGroupInRegions = function ( regions ) { $.uls.data.getLanguagesByScriptGroupInRegions = function ( regions ) {
var languagesByScriptGroupInRegions = {}; var language, i, scriptGroup,
languagesByScriptGroupInRegions = {};
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( $.uls.data.isRedirect( language ) ) { if ( $.uls.data.isRedirect( language ) ) {
continue; continue;
} }
for ( var i = 0; i < regions.length; i++ ) { for ( i = 0; i < regions.length; i++ ) {
if ( $.inArray( regions[i], $.uls.data.getRegions( language ) ) !== -1 ) { if ( $.inArray( regions[i], $.uls.data.getRegions( language ) ) !== -1 ) {
var scriptGroup = $.uls.data.getScriptGroupOfLanguage( language ); scriptGroup = $.uls.data.getScriptGroupOfLanguage( language );
if ( languagesByScriptGroupInRegions[scriptGroup] === undefined ) { if ( languagesByScriptGroupInRegions[scriptGroup] === undefined ) {
languagesByScriptGroupInRegions[scriptGroup] = []; languagesByScriptGroupInRegions[scriptGroup] = [];
@@ -293,9 +299,9 @@
* @return associative array * @return associative array
*/ */
$.uls.data.getAllLanguagesByRegionAndScript = function () { $.uls.data.getAllLanguagesByRegionAndScript = function () {
var allLanguagesByRegionAndScript = {}, var region, regionGroup, language,
region, script, scriptGroup, regions, regionNum,
regionGroup; allLanguagesByRegionAndScript = {};
for ( region in $.uls.data.regiongroups ) { for ( region in $.uls.data.regiongroups ) {
regionGroup = $.uls.data.regiongroups[region]; regionGroup = $.uls.data.regiongroups[region];
@@ -307,16 +313,16 @@
allLanguagesByRegionAndScript[regionGroup][region] = {}; allLanguagesByRegionAndScript[regionGroup][region] = {};
} }
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( $.uls.data.isRedirect( language ) ) { if ( $.uls.data.isRedirect( language ) ) {
continue; continue;
} }
var script = $.uls.data.getScript( language ); script = $.uls.data.getScript( language );
var scriptGroup = $.uls.data.getGroupOfScript( script ); scriptGroup = $.uls.data.getGroupOfScript( script );
var regions = $.uls.data.getRegions( language ); regions = $.uls.data.getRegions( language );
for ( var regionNum = 0; regionNum < regions.length; regionNum++ ) { for ( regionNum = 0; regionNum < regions.length; regionNum++ ) {
region = regions[regionNum]; region = regions[regionNum];
regionGroup = $.uls.data.regiongroups[region]; regionGroup = $.uls.data.regiongroups[region];
@@ -341,9 +347,10 @@
* @return array of strings * @return array of strings
*/ */
$.uls.data.getRegionsInGroup = function ( groupNum ) { $.uls.data.getRegionsInGroup = function ( groupNum ) {
var regionsInGroup = []; var region,
regionsInGroup = [];
for ( var region in $.uls.data.regiongroups ) { for ( region in $.uls.data.regiongroups ) {
if ( $.uls.data.regiongroups[region] === groupNum ) { if ( $.uls.data.regiongroups[region] === groupNum ) {
regionsInGroup.push( region ); regionsInGroup.push( region );
} }
@@ -360,9 +367,11 @@
* @return string script group name * @return string script group name
*/ */
$.uls.data.getGroupOfScript = function ( script ) { $.uls.data.getGroupOfScript = function ( script ) {
for ( var group in $.uls.data.scriptgroups ) { var scriptGroup;
if ( $.inArray( script, $.uls.data.scriptgroups[group] ) !== -1 ) {
return group; for ( scriptGroup in $.uls.data.scriptgroups ) {
if ( $.inArray( script, $.uls.data.scriptgroups[scriptGroup] ) !== -1 ) {
return scriptGroup;
} }
} }

View File

@@ -167,7 +167,7 @@
for ( langNum = 0; langNum < languagesInScript.length; langNum++ ) { for ( langNum = 0; langNum < languagesInScript.length; langNum++ ) {
langCode = languagesInScript[langNum]; langCode = languagesInScript[langNum];
if ( query === "" || this.filter( langCode, query ) ) { if ( query === '' || this.filter( langCode, query ) ) {
if ( this.resultCount === 0 ) { if ( this.resultCount === 0 ) {
// Autofill the first result. // Autofill the first result.
this.autofill( langCode ); this.autofill( langCode );
@@ -195,14 +195,16 @@
var languageFilter = this; var languageFilter = this;
$.get( languageFilter.options.searchAPI, { search: query }, function( result ) { $.get( languageFilter.options.searchAPI, { search: query }, function( result ) {
$.each( result['languagesearch'], function( code, name ) { $.each( result.languagesearch, function( code, name ) {
if ( languageFilter.resultCount === 0 ) { if ( languageFilter.resultCount === 0 ) {
// Autofill the first result. // Autofill the first result.
languageFilter.autofill( code, name ); languageFilter.autofill( code, name );
} }
languageFilter.render( code ); languageFilter.render( code );
languageFilter.resultCount++; languageFilter.resultCount++;
} ); } );
languageFilter.resultHandler( query ); languageFilter.resultHandler( query );
} ); } );
}, },
@@ -242,15 +244,16 @@
// see if it was autonym match // see if it was autonym match
autonym = $.uls.data.getAutonym( langCode ) || ''; autonym = $.uls.data.getAutonym( langCode ) || '';
suggestion = userInput + autonym.substring( userInput.length, autonym.length ); suggestion = userInput + autonym.substring( userInput.length, autonym.length );
if ( suggestion !== autonym ) { if ( suggestion !== autonym ) {
// Give up. It may be iso/script code match. // Give up. It may be an ISO/script code match.
suggestion = ""; suggestion = '';
} }
} }
// Make sure that it is a visual prefix. // Make sure that it is a visual prefix.
if ( !isVisualPrefix( userInput, suggestion ) ) { if ( !isVisualPrefix( userInput, suggestion ) ) {
suggestion = ""; suggestion = '';
} }
this.$suggestion.val( suggestion ); this.$suggestion.val( suggestion );
@@ -267,7 +270,7 @@
}, },
escapeRegex: function( value ) { escapeRegex: function( value ) {
return value.replace( /[\-\[\]{}()*+?.,\\\^$\|#\s]/g, "\\$&" ); return value.replace( /[\-\[\]{}()*+?.,\\\^$\|#\s]/g, '\\$&' );
}, },
/** /**
@@ -280,7 +283,7 @@
*/ */
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' ),
languageName = this.options.languages[langCode]; languageName = this.options.languages[langCode];
return matcher.test( languageName ) || return matcher.test( languageName ) ||
@@ -336,7 +339,7 @@
function isVisualPrefix( prefix, string ) { function isVisualPrefix( prefix, string ) {
// Pre-base vowel signs of Indic languages. A vowel sign is called pre-base if // Pre-base vowel signs of Indic languages. A vowel sign is called pre-base if
// consonant + vowel becomes [vowel][consonant] when rendered. Eg: ക + െ => കെ // consonant + vowel becomes [vowel][consonant] when rendered. Eg: ക + െ => കെ
var prebases = "െേൈൊോൌெேைொோௌେୈୋୌિਿिিেৈোৌෙේෛොෝෞ"; var prebases = 'െേൈൊോൌெேைொோௌେୈୋୌિਿिিেৈোৌෙේෛොෝෞ';
return prebases.indexOf( string[prefix.length] ) <= 0; return prebases.indexOf( string[prefix.length] ) <= 0;
} }
} ( jQuery ) ); } ( jQuery ) );

View File

@@ -22,6 +22,7 @@
( function ( $ ) { ( function ( $ ) {
'use strict'; 'use strict';
/*jshint multistr:true */
var noResultsTemplate = '\ var noResultsTemplate = '\
<div class="twelve columns uls-no-results-view">\ <div class="twelve columns uls-no-results-view">\
<h2 data-i18n="uls-no-results-found" class="eleven columns end offset-by-one uls-no-results-found-title">\ <h2 data-i18n="uls-no-results-found" class="eleven columns end offset-by-one uls-no-results-found-title">\
@@ -44,6 +45,7 @@
</div>\ </div>\
</div>\ </div>\
</div>'; </div>';
/*jshint multistr:false */
var LanguageCategoryDisplay = function ( element, options ) { var LanguageCategoryDisplay = function ( element, options ) {
this.$element = $( element ); this.$element = $( element );
@@ -211,7 +213,7 @@
.text( 'Common languages' ); // This is placeholder text if jquery.i18n not present .text( 'Common languages' ); // This is placeholder text if jquery.i18n not present
$quickListSection.append( $quickListSectionTitle ); $quickListSection.append( $quickListSectionTitle );
this.$element.prepend( $quickListSection ); this.$element.prepend( $quickListSection );
this.regionDivs[ 'quick' ] = $quickListSection; this.regionDivs.quick = $quickListSection;
for ( var i = 0; i < quickList.length; i++) { for ( var i = 0; i < quickList.length; i++) {
var $column = this.getColumn( 'quick', i % 4 === 0 ); var $column = this.getColumn( 'quick', i % 4 === 0 );

View File

@@ -12,6 +12,9 @@
* header is left intact. See files GPL-LICENSE and MIT-LICENSE for details. * header is left intact. See files GPL-LICENSE and MIT-LICENSE for details.
* *
*/ */
/*jshint sub:true */
( function ( $ ) { ( function ( $ ) {
'use strict'; 'use strict';
@@ -22,10 +25,12 @@
* they belong to the 'Other' group. * they belong to the 'Other' group.
*/ */
var orphanScripts = function () { var orphanScripts = function () {
var result = []; var language, script,
result = [];
for ( language in $.uls.data.languages ) {
script = $.uls.data.getScript( language );
for ( var language in $.uls.data.languages ) {
var script = $.uls.data.getScript( language );
if ( $.uls.data.getGroupOfScript( script ) === 'Other' ) { if ( $.uls.data.getGroupOfScript( script ) === 'Other' ) {
result.push( script ); result.push( script );
} }
@@ -38,10 +43,11 @@
* Runs over all languages and checks that all redirects have a valid target. * Runs over all languages and checks that all redirects have a valid target.
*/ */
var badRedirects = function () { var badRedirects = function () {
var result = []; var language, target,
result = [];
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
var target = $.uls.data.isRedirect( language ); target = $.uls.data.isRedirect( language );
if ( target && !$.uls.data.languages[target] ) { if ( target && !$.uls.data.languages[target] ) {
result.push( language ); result.push( language );
@@ -56,10 +62,11 @@
* There's no reason to have double redirects. * There's no reason to have double redirects.
*/ */
var doubleRedirects = function () { var doubleRedirects = function () {
var result = []; var language, target,
result = [];
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
var target = $.uls.data.isRedirect( language ); target = $.uls.data.isRedirect( language );
if ( target && $.uls.data.isRedirect( target ) ) { if ( target && $.uls.data.isRedirect( target ) ) {
result.push( language ); result.push( language );
@@ -74,9 +81,10 @@
* they have something that looks like an autonym. * they have something that looks like an autonym.
*/ */
var languagesWithoutAutonym = function () { var languagesWithoutAutonym = function () {
var result = []; var language,
result = [];
for ( var language in $.uls.data.languages ) { for ( language in $.uls.data.languages ) {
if ( typeof $.uls.data.getAutonym( language ) !== 'string' ) { if ( typeof $.uls.data.getAutonym( language ) !== 'string' ) {
result.push( language ); result.push( language );
} }
@@ -85,11 +93,19 @@
return result; return result;
}; };
test( "-- Initial check", 1, function ( assert ) { test( '-- Initial check', 1, function ( assert ) {
assert.ok( $.fn.uls, "$.fn.uls is defined" ); assert.ok( $.fn.uls, '$.fn.uls is defined' );
} ); } );
test( "-- $.uls.data testing", 46, function ( assert ) { test( '-- $.uls.data testing', 46, function ( assert ) {
var autonyms,
allLanguagesByRegionAndScript,
languagesInEU,
languagesByScriptInAM, languagesByScriptInEU,
languagesToGroup, groupedLanguages,
languagesByScriptGroupInEMEA,
allLanguagesByScriptGroup;
// Add a language in run time. // Add a language in run time.
// This is done early to make sure that it doesn't break other functions. // This is done early to make sure that it doesn't break other functions.
$.uls.data.addLanguage( 'qqq', { $.uls.data.addLanguage( 'qqq', {
@@ -100,11 +116,11 @@
assert.ok( $.uls.data.getAutonym( 'qqq' ), 'Language documentation', 'Language qqq was added with the correct autonym' ); assert.ok( $.uls.data.getAutonym( 'qqq' ), 'Language documentation', 'Language qqq was added with the correct autonym' );
assert.strictEqual( $.uls.data.isRedirect( 'sr-ec' ), 'sr-cyrl', "'sr-ec' is a redirect to 'sr-cyrl'" ); assert.strictEqual( $.uls.data.isRedirect( 'sr-ec' ), 'sr-cyrl', '"sr-ec" is a redirect to "sr-cyrl"' );
var autonyms = $.uls.data.getAutonyms(); autonyms = $.uls.data.getAutonyms();
assert.strictEqual( autonyms['zu'], 'isiZulu', 'Correct autonym is returned for Zulu using getAutonyms().' ); assert.strictEqual( autonyms['zu'], 'isiZulu', 'Correct autonym is returned for Zulu using getAutonyms().' );
assert.strictEqual( autonyms['pa'], undefined, "Language 'pa' is not listed in autonyms, because it's a redirect" ); assert.strictEqual( autonyms['pa'], undefined, 'Language "pa" is not listed in autonyms, because it is a redirect' );
assert.strictEqual( autonyms['pa-guru'], 'ਪੰਜਾਬੀ', "Language 'pa-guru' has the correct autonym" ); assert.strictEqual( autonyms['pa-guru'], 'ਪੰਜਾਬੀ', 'Language "pa-guru" has the correct autonym' );
// 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.
@@ -129,9 +145,9 @@
assert.deepEqual( $.uls.data.getRegions( 'lzz' ), [ assert.deepEqual( $.uls.data.getRegions( 'lzz' ), [
'EU', 'ME' 'EU', 'ME'
], 'Correct regions of the Laz language were selected' ); ], 'Correct regions of the Laz language were selected' );
assert.strictEqual( $.uls.data.getRegions( 'no-such-language' ), 'UNKNOWN', "The region of an invalid language is 'UNKNOWN'" ); assert.strictEqual( $.uls.data.getRegions( 'no-such-language' ), 'UNKNOWN', 'The region of an invalid language is "UNKNOWN"' );
var allLanguagesByRegionAndScript = $.uls.data.getAllLanguagesByRegionAndScript(); allLanguagesByRegionAndScript = $.uls.data.getAllLanguagesByRegionAndScript();
assert.deepEqual( allLanguagesByRegionAndScript['4']['AS']['SouthEastAsian']['Bugi'], [ assert.deepEqual( allLanguagesByRegionAndScript['4']['AS']['SouthEastAsian']['Bugi'], [
'bug' 'bug'
], 'All languages in the Buginese script in Asia were selected' ); ], 'All languages in the Buginese script in Asia were selected' );
@@ -139,39 +155,39 @@
'pa-guru' 'pa-guru'
], 'Only language pa-guru appears as a language in script Guru in SouthAsian languages in Asia' ); ], 'Only language pa-guru appears as a language in script Guru in SouthAsian languages in Asia' );
var languagesInEU = $.uls.data.getLanguagesInRegion( 'EU' ); languagesInEU = $.uls.data.getLanguagesInRegion( 'EU' );
assert.strictEqual( $.inArray( 'sr-ec', languagesInEU ), -1, "Language 'sr-ec' doesn't appear in languages of region EU, because it's a redirect" ); assert.strictEqual( $.inArray( 'sr-ec', languagesInEU ), -1, 'Language "sr-ec" does not appear in languages of region EU, because it is a redirect' );
assert.ok( $.inArray( 'sr-cyrl', languagesInEU ) > -1, "Language 'sr-cyrl' appears in languages of region EU, because it's not a redirect" ); assert.ok( $.inArray( 'sr-cyrl', languagesInEU ) > -1, 'Language "sr-cyrl" appears in languages of region EU, because it is not a redirect' );
assert.deepEqual( $.uls.data.getLanguagesInRegion( "PA" ), assert.deepEqual( $.uls.data.getLanguagesInRegion( 'PA' ),
[ [
"ace", "bi", "ch", "en-gb", "en", "fj", "haw", "hif", "ho", "jv", "jv-java", 'ace', 'bi', 'ch', 'en-gb', 'en', 'fj', 'haw', 'hif', 'ho', 'jv', 'jv-java',
"mh", "mi", "na", "niu", "pih", "pis", "pt", "rtm", "sm", "tet", 'mh', 'mi', 'na', 'niu', 'pih', 'pis', 'pt', 'rtm', 'sm', 'tet',
"to", "tpi", "ty", "wls" 'to', 'tpi', 'ty', 'wls'
], ],
"languages of region PA are selected correctly" ); 'languages of region PA are selected correctly' );
assert.deepEqual( $.uls.data.getLanguagesInRegions( ["AM", "WW"] ), assert.deepEqual( $.uls.data.getLanguagesInRegions( ['AM', 'WW'] ),
[ [
"akz", "arn", "aro", "ase", "avk", "ay", "cho", "chr", "chy", "cr", "cr-latn", 'akz', 'arn', 'aro', 'ase', 'avk', 'ay', 'cho', 'chr', 'chy', 'cr', 'cr-latn',
"en-ca", "en", "eo", "es-419", "es-formal", "es", "esu", "fr", "frc", "gcf", "gn", 'en-ca', 'en', 'eo', 'es-419', 'es-formal', 'es', 'esu', 'fr', 'frc', 'gcf', 'gn',
"guc", "haw", "ht", "ia", "ie", "ik", "ike-cans", "ike-latn", "io", "iu", "jam", 'guc', 'haw', 'ht', 'ia', 'ie', 'ik', 'ike-cans', 'ike-latn', 'io', 'iu', 'jam',
"jbo", "kgp", "kl", "lad-latn", "lad-hebr", "lfn", "mfe", "mic", "mus", "nah", "nl-informal", "nl", 'jbo', 'kgp', 'kl', 'lad-latn', 'lad-hebr', 'lfn', 'mfe', 'mic', 'mus', 'nah', 'nl-informal', 'nl',
"nov", "nv", "pap", "pdc", "pdt", "ppl", "pt-br", "pt", "qu", "qug", "rap", "sei", 'nov', 'nv', 'pap', 'pdc', 'pdt', 'ppl', 'pt-br', 'pt', 'qu', 'qug', 'rap', 'sei',
"simple", "srn", "tokipona", "vo", "yi", "yrl", "yua" 'simple', 'srn', 'tokipona', 'vo', 'yi', 'yrl', 'yua'
], ],
"languages of regions AM and WW are selected correctly" 'languages of regions AM and WW are selected correctly'
); );
assert.deepEqual( $.uls.data.getLanguagesInScript( 'Knda' ), [ assert.deepEqual( $.uls.data.getLanguagesInScript( 'Knda' ), [
"kn", "tcy" 'kn', 'tcy'
], "languages in script Knda are selected correctly" ); ], 'languages in script Knda are selected correctly' );
assert.deepEqual( $.uls.data.getLanguagesInScript( 'Guru' ), assert.deepEqual( $.uls.data.getLanguagesInScript( 'Guru' ),
["pa-guru"], ['pa-guru'],
"'pa-guru' is written in script Guru, and 'pa' is skipped as a redirect" '"pa-guru" is written in script Guru, and "pa" is skipped as a redirect'
); );
assert.deepEqual( $.uls.data.getLanguagesInScripts( ['Geor', 'Armn'] ), assert.deepEqual( $.uls.data.getLanguagesInScripts( ['Geor', 'Armn'] ),
["hy", "ka", "xmf"], ['hy', 'ka', 'xmf'],
"languages in scripts Geor and Armn are selected correctly" 'languages in scripts Geor and Armn are selected correctly'
); );
assert.deepEqual( $.uls.data.getRegionsInGroup( 3 ), [ assert.deepEqual( $.uls.data.getRegionsInGroup( 3 ), [
@@ -184,48 +200,48 @@
'WW', 'SP' 'WW', 'SP'
], 'regions in group 1 are selected correctly' ); ], 'regions in group 1 are selected correctly' );
var languagesByScriptInAM = $.uls.data.getLanguagesByScriptInRegion( "AM" ); languagesByScriptInAM = $.uls.data.getLanguagesByScriptInRegion( 'AM' );
assert.deepEqual( languagesByScriptInAM['Cans'], [ assert.deepEqual( languagesByScriptInAM['Cans'], [
"cr", "ike-cans", "iu" 'cr', 'ike-cans', 'iu'
], "correct languages in Cans in AM selected" ); ], 'correct languages in Cans in AM selected' );
var languagesByScriptInEU = $.uls.data.getLanguagesByScriptInRegion( "EU" ); languagesByScriptInEU = $.uls.data.getLanguagesByScriptInRegion( 'EU' );
assert.strictEqual( $.inArray( 'sr-el', languagesByScriptInEU['Latn'] ), -1, assert.strictEqual( $.inArray( 'sr-el', languagesByScriptInEU['Latn'] ), -1,
"Language 'sr-el' doesn't appear as a Latin-script language in EU, because it's a redirect" ); 'Language "sr-el" does not appear as a Latin-script language in EU, because it is a redirect' );
assert.ok( $.inArray( 'sr-latn', languagesByScriptInEU['Latn'] ) > -1, assert.ok( $.inArray( 'sr-latn', languagesByScriptInEU['Latn'] ) > -1,
"Language 'sr-latn' appears as a Latin-script language in EU, because it's not a redirect" ); 'Language "sr-latn" appears as a Latin-script language in EU, because it is not a redirect' );
assert.strictEqual( $.uls.data.getAutonym( 'pa' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected using code pa.' ); assert.strictEqual( $.uls.data.getAutonym( 'pa' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected using code pa.' );
assert.strictEqual( $.uls.data.getAutonym( 'pa-guru' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected using code pa-guru.' ); assert.strictEqual( $.uls.data.getAutonym( 'pa-guru' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected using code pa-guru.' );
var languagesToGroup = { languagesToGroup = {
'en': 'English', 'en': 'English',
'fiu-vro': 'Võro', // Alias before target 'fiu-vro': 'Võro', // Alias before target
'ru': 'русский', 'ru': 'русский',
'sr': 'српски', // Alias before target 'sr': 'српски', // Alias before target
'sr-cyrl': 'српски', // Target before alias 'sr-cyrl': 'српски', // Target before alias
'sr-latn': 'srpski', // Target before alias 'sr-latn': 'srpski', // Target before alias
'sr-el': 'srpski', // Alias after target 'sr-el': 'srpski', // Alias after target
'vro': 'Võro' // Target after alias 'vro': 'Võro' // Target after alias
}, };
groupedLanguages = { groupedLanguages = {
Latin: [ 'en', 'vro', 'sr-latn' ], Latin: [ 'en', 'vro', 'sr-latn' ],
Cyrillic: [ 'ru', 'sr-cyrl' ] Cyrillic: [ 'ru', 'sr-cyrl' ]
}; };
assert.deepEqual( $.uls.data.getLanguagesByScriptGroup( languagesToGroup ), groupedLanguages, assert.deepEqual( $.uls.data.getLanguagesByScriptGroup( languagesToGroup ), groupedLanguages,
'A custom list of languages is grouped correctly using getLanguagesByScriptGroup.' ); 'A custom list of languages is grouped correctly using getLanguagesByScriptGroup.' );
var languagesByScriptGroupInEMEA = $.uls.data.getLanguagesByScriptGroupInRegions( $.uls.data.getRegionsInGroup( 3 ) ); languagesByScriptGroupInEMEA = $.uls.data.getLanguagesByScriptGroupInRegions( $.uls.data.getRegionsInGroup( 3 ) );
assert.deepEqual( languagesByScriptGroupInEMEA['WestCaucasian'], [ assert.deepEqual( languagesByScriptGroupInEMEA['WestCaucasian'], [
'hy', 'ka', 'xmf' 'hy', 'ka', 'xmf'
], 'Correct languages in WestCaucasian script group in EMEA selected' ); ], 'Correct languages in WestCaucasian script group in EMEA selected' );
assert.strictEqual( $.inArray( 'sr-ec', languagesByScriptGroupInEMEA['Cyrillic'] ), -1, assert.strictEqual( $.inArray( 'sr-ec', languagesByScriptGroupInEMEA['Cyrillic'] ), -1,
"Language 'sr-ec' doesn't appear as a Cyrillic-scriptgroup language in EMEA, because it's a redirect" ); 'Language "sr-ec" does not appear as a Cyrillic-scriptgroup language in EMEA, because it is a redirect' );
assert.ok( $.inArray( 'sr-cyrl', languagesByScriptGroupInEMEA['Cyrillic'] ) > -1, assert.ok( $.inArray( 'sr-cyrl', languagesByScriptGroupInEMEA['Cyrillic'] ) > -1,
"Language 'sr-cyrl' appears as a Cyrillic-scriptgroup language in EMEA, because it's not a redirect" ); 'Language "sr-cyrl" appears as a Cyrillic-scriptgroup language in EMEA, because it is not a redirect' );
var allLanguagesByScriptGroup = $.uls.data.getAllLanguagesByScriptGroup(); allLanguagesByScriptGroup = $.uls.data.getAllLanguagesByScriptGroup();
assert.deepEqual( allLanguagesByScriptGroup['Greek'], [ assert.deepEqual( allLanguagesByScriptGroup['Greek'], [
'el', 'grc', 'pnt', 'ruq-grek', 'tsd' 'el', 'grc', 'pnt', 'ruq-grek', 'tsd'
], 'All languages in the Greek script found' ); ], 'All languages in the Greek script found' );
@@ -239,13 +255,15 @@
'gn', 'de', 'hu', 'fi' 'gn', 'de', 'hu', 'fi'
], 'Languages are correctly sorted by autonym' ); ], 'Languages are correctly sorted by autonym' );
assert.strictEqual( $.uls.data.isRtl( "te" ), false, "Telugu language is not RTL" ); assert.strictEqual( $.uls.data.isRtl( 'te' ), false, 'Telugu language is not RTL' );
assert.strictEqual( $.uls.data.isRtl( "dv" ), true, "Divehi language is RTL" ); assert.strictEqual( $.uls.data.isRtl( 'dv' ), true, 'Divehi language is RTL' );
assert.strictEqual( $.uls.data.getDir( "mzn" ), "rtl", "Mazandarani language is RTL" ); assert.strictEqual( $.uls.data.getDir( 'mzn' ), 'rtl', 'Mazandarani language is RTL' );
assert.strictEqual( $.uls.data.getDir( "uk" ), "ltr", "Ukrainian language is LTR" ); assert.strictEqual( $.uls.data.getDir( 'uk' ), 'ltr', 'Ukrainian language is LTR' );
assert.ok( $.inArray( "sah", $.uls.data.getLanguagesInTerritory( "RU" ) ) assert.ok(
> -1, "Sakha language is spoken in Russia" ); $.inArray( 'sah', $.uls.data.getLanguagesInTerritory( 'RU' ) ) > -1,
'Sakha language is spoken in Russia'
);
assert.ok( $.uls.data.deleteLanguage( 'qqq' ), 'Deleting language qqq, which was added earlier, returns true.' ); assert.ok( $.uls.data.deleteLanguage( 'qqq' ), 'Deleting language qqq, which was added earlier, returns true.' );
assert.strictEqual( $.uls.data.languages['qqq'], undefined, 'Data about qqq is undefined after being deleted.' ); assert.strictEqual( $.uls.data.languages['qqq'], undefined, 'Data about qqq is undefined after being deleted.' );