From e1a4f7f0cbc7b350e3a441c4905538b30db2df14 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 17 Sep 2012 17:10:59 -0700 Subject: [PATCH] After training the PHPStorm code formatter. See https://github.com/siebrand/MediaWiki-PHPStorm Issue remains with anonymous functions in JavaScript. Change-Id: I2b520f8df127452acf02deb659277a6465e6ca59 --- UniversalLanguageSelector.hooks.php | 25 ++- UniversalLanguageSelector.i18n.php | 2 +- UniversalLanguageSelector.php | 2 +- api/ApiLanguageSearch.php | 2 +- data/LanguageNameSearch.php | 7 +- resources/css/ext.uls.css | 3 +- resources/css/ext.uls.displaysettings.css | 6 +- resources/css/ext.uls.languagesettings.css | 4 +- resources/js/ext.uls.displaysettings.js | 66 +++---- resources/js/ext.uls.geoclient.js | 2 +- resources/js/ext.uls.init.js | 16 +- resources/js/ext.uls.languagesettings.js | 16 +- resources/js/ext.uls.webfonts.js | 4 +- tests/language_settings.html | 64 +++---- tests/phpunit/LanguageSearchTest.php | 2 +- tests/qunit/ext.uls.tests.js | 205 +++++++++++--------- tests/webfonts.html | 208 +++++++++++---------- 17 files changed, 336 insertions(+), 298 deletions(-) diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index 0b9df72b..94007501 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -32,6 +32,7 @@ class UniversalLanguageSelectorHooks { if ( $wgULSGeoService ) { $out->addModules( 'ext.uls.geoclient' ); } + return true; } @@ -48,6 +49,7 @@ class UniversalLanguageSelectorHooks { 'localBasePath' => __DIR__, 'remoteExtPath' => 'UniversalLanguageSelector', ); + return true; } @@ -57,17 +59,21 @@ class UniversalLanguageSelectorHooks { */ static function addTrigger( array &$personal_urls, &$title ) { global $wgLang; - $personal_urls = array( 'uls' => array( - 'text' => $wgLang->getLanguageName( $wgLang->getCode() ), - 'href' => '#', - 'class' => 'uls-trigger', - 'active' => true - ) ) + $personal_urls; + $personal_urls = array( + 'uls' => array( + 'text' => $wgLang->getLanguageName( $wgLang->getCode() ), + 'href' => '#', + 'class' => 'uls-trigger', + 'active' => true + ) + ) + $personal_urls; + return true; } protected static function isSupportedLanguage( $language ) { $supported = Language::fetchLanguageNames( null, 'mwfile' ); + return isset( $supported[$language] ); } @@ -93,6 +99,7 @@ class UniversalLanguageSelectorHooks { return $code; } } + return ""; } @@ -151,6 +158,7 @@ class UniversalLanguageSelectorHooks { public static function addConfig( &$vars ) { global $wgULSGeoService; $vars['wgULSGeoService'] = $wgULSGeoService; + return true; } @@ -160,8 +168,11 @@ class UniversalLanguageSelectorHooks { * @return bool */ public static function addVariables( &$vars, OutputPage $out ) { - $vars['wgULSLanguages'] = Language::fetchLanguageNames( $out->getLanguage()->getCode(), 'mwfile' ); + $vars['wgULSLanguages'] = Language::fetchLanguageNames( + $out->getLanguage()->getCode(), 'mwfile' + ); $vars['wgULSAcceptLanguageList'] = array_keys( $out->getRequest()->getAcceptLang() ); + return true; } } diff --git a/UniversalLanguageSelector.i18n.php b/UniversalLanguageSelector.i18n.php index 8d39e83d..3db79b46 100644 --- a/UniversalLanguageSelector.i18n.php +++ b/UniversalLanguageSelector.i18n.php @@ -31,7 +31,7 @@ $messages['en'] = array( ); /** * Message documentation - * @author santhosh + * @author santhosh */ $messages['qqq'] = array( 'UniversalLanguageSelector' => 'Extension name', diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index faa80353..7966bff4 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -63,7 +63,7 @@ $wgULSGeoService = 'http://freegeoip.net/json/'; */ $wgULSLanguageDetection = true; -$dir = __DIR__ ; +$dir = __DIR__; // Internationalization $wgExtensionMessagesFiles['UniversalLanguageSelector'] = "$dir/UniversalLanguageSelector.i18n.php"; diff --git a/api/ApiLanguageSearch.php b/api/ApiLanguageSearch.php index 35b6751b..05d1c277 100644 --- a/api/ApiLanguageSearch.php +++ b/api/ApiLanguageSearch.php @@ -67,8 +67,8 @@ class ApiLanguageSearch extends ApiBase { 'api.php?action=languagesearch&search=ഫി&typos=1', ); } + public function getVersion() { return __CLASS__ . ': ' . ULS_VERSION; } - } diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php index 49196e7b..b662afcd 100644 --- a/data/LanguageNameSearch.php +++ b/data/LanguageNameSearch.php @@ -44,6 +44,7 @@ class LanguageNameSearch { $results[$code] = $name; } } + return $results; } @@ -57,6 +58,7 @@ class LanguageNameSearch { if ( !isset( $buckets[$bucket] ) ) { $buckets[$bucket] = array(); } + return $bucket; } @@ -73,7 +75,7 @@ class LanguageNameSearch { $thisValue = ord( $str[$i] ); if ( $thisValue < 128 ) { return $thisValue; - } else {// Codepoints larger than 127 are represented by multi-byte sequences, + } else { // Codepoints larger than 127 are represented by multi-byte sequences, if ( count( $values ) === 0 ) { // 224 is the lowest non-overlong-encoded codepoint. $lookingFor = ( $thisValue < 224 ) ? 2 : 3; @@ -82,6 +84,7 @@ class LanguageNameSearch { if ( count( $values ) === $lookingFor ) { // Refer http://en.wikipedia.org/wiki/UTF-8#Description $number = ( $lookingFor === 3 ) ? ( ( $values[0] % 16 ) * 4096 ) + ( ( $values[1] % 64 ) * 64 ) + ( $values[2] % 64 ) : ( ( $values[0] % 32 ) * 64 ) + ( $values[1] % 64 ); + return $number; } } @@ -120,7 +123,7 @@ class LanguageNameSearch { } $prevRow = $currentRow; } + return $prevRow[$length2]; } - } diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css index 5a408183..15389e97 100644 --- a/resources/css/ext.uls.css +++ b/resources/css/ext.uls.css @@ -82,8 +82,7 @@ button.button.down { button.button:disabled, button.button.hover:disabled, button.button.disabled, -button.button.disabled:hover - { +button.button.disabled:hover { background-color: #F0F0F0; background-image: -webkit-linear-gradient(top, #f0f0f0, #f0f0f0); background-image: -moz-linear-gradient(center top, #F0F0F0, #F0F0F0); diff --git a/resources/css/ext.uls.displaysettings.css b/resources/css/ext.uls.displaysettings.css index 64e971cc..8e81c74d 100644 --- a/resources/css/ext.uls.displaysettings.css +++ b/resources/css/ext.uls.displaysettings.css @@ -1,4 +1,4 @@ -.uls-font-label,.uls-font-select { +.uls-font-label, .uls-font-select { font-size: 10pt; line-height: 16pt; } @@ -17,11 +17,11 @@ width: auto; } -.uls-content-fonts,.uls-ui-fonts { +.uls-content-fonts, .uls-ui-fonts { padding-top: 10px; } -.uls-content-fonts:hover,.uls-ui-fonts:hover { +.uls-content-fonts:hover, .uls-ui-fonts:hover { background-color: #F6F6F6; } diff --git a/resources/css/ext.uls.languagesettings.css b/resources/css/ext.uls.languagesettings.css index 07cdd6ff..d5cec5ec 100644 --- a/resources/css/ext.uls.languagesettings.css +++ b/resources/css/ext.uls.languagesettings.css @@ -1,6 +1,5 @@ #uls-current-language-nav { /* @embed */ - background: url('../images/cog-16x16-ltr.png') no-repeat scroll right - top transparent; + background: url('../images/cog-16x16-ltr.png') no-repeat scroll right top transparent; cursor: pointer; } @@ -93,7 +92,6 @@ border-left-color: #3366BB; } - #languagesettings-panels div#settings-block { border-left: 1px solid #C9C9C9; padding-left: 10px; diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 329997b0..482db2f2 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -17,39 +17,39 @@ * @licence MIT License */ -( function( $, mw, undefined ) { +( function ( $, mw, undefined ) { "use strict"; var template = '

Display settings

' - + '

Language used for menus

' - + '
' - + '
' - + '

Font settings

' - + '
' - + '
' - + '' - + '
' - + '
' - + '
Select your preferred fonts
' - + '
' - + '
' - + '' - + '
' - + '
' - + '
' - + '' - + '
' - + '
' - + '
' - + '
' - + '' - + '' - + '
' - + '
'; // FIXME i18n and too much hardcoding. + + '

Language used for menus

' + + '
' + + '
' + + '

Font settings

' + + '
' + + '
' + + '' + + '
' + + '
' + + '
Select your preferred fonts
' + + '
' + + '
' + + '' + + '
' + + '
' + + '
' + + '' + + '
' + + '
' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; // FIXME i18n and too much hardcoding. var DisplaySettings = function ( $parent ) { this.name = "Display"; @@ -236,7 +236,7 @@ $systemFont.attr( 'selected', savedFont === 'system' || !savedFont ); var $fontLabel = this.$template.find( 'label#ui-font-selector-label' ); $fontLabel.html( "Select font for " + $.uls.data.autonym( this.uiLanguage ) - + "
Used for menus
" ); + + "
Used for menus
" ); }, /** @@ -264,7 +264,7 @@ $systemFont.attr( 'selected', savedFont === 'system' || !savedFont ); var $fontLabel = this.$template.find( '#content-font-selector-label' ); $fontLabel.html( "Select font for " + $.uls.data.autonym( this.contentLanguage ) - + "
Used for content
" ); + + "
Used for content
" ); }, /** @@ -326,7 +326,7 @@ * Close the language settings window. * Depending on the context, actions vary. */ - close: function () { + close: function () { this.$parent.close(); }, diff --git a/resources/js/ext.uls.geoclient.js b/resources/js/ext.uls.geoclient.js index 0dc83cb5..65a06cfe 100644 --- a/resources/js/ext.uls.geoclient.js +++ b/resources/js/ext.uls.geoclient.js @@ -17,7 +17,7 @@ * @licence MIT License */ -( function( mw, $ ) { +( function ( mw, $ ) { "use strict"; mw.uls = mw.uls || {}; diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js index b02737d3..cfcf1e2b 100644 --- a/resources/js/ext.uls.init.js +++ b/resources/js/ext.uls.init.js @@ -26,7 +26,6 @@ searchAPI: mw.util.wikiScript( 'api' ) + "?action=languagesearch" } ); - var currentLang = mw.config.get( 'wgUserLanguage' ); mw.uls = mw.uls || {}; mw.uls.previousLanguagesCookie = 'uls-previous-languages'; @@ -65,9 +64,11 @@ mw.uls.getFrequentLanguageList = function () { var unique = [], - list = [ mw.config.get( 'wgUserLanguage' ), + list = [ + mw.config.get( 'wgUserLanguage' ), mw.config.get( 'wgContentLanguage' ), - mw.uls.getBrowserLanguage() ] + mw.uls.getBrowserLanguage() + ] .concat( mw.uls.getPreviousLanguages() ) .concat( mw.uls.getAcceptLanguageList() ); if ( window.GEO ) { @@ -85,12 +86,12 @@ return unique; }; - $( document ).ready( function() { + $( document ).ready( function () { var $ulsTrigger = $( '.uls-trigger' ), previousLanguages = mw.uls.getPreviousLanguages() || [], previousLang = previousLanguages.slice( -1 )[0]; - function displaySettings() { + function displaySettings () { var $displaySettingsTitle = $( '
' ) .addClass( 'settings-title' ) .text( 'Display settings' ), @@ -105,7 +106,7 @@ return $displaySettings; } - function addDisplaySettings( uls ) { + function addDisplaySettings ( uls ) { var $displaySettings = displaySettings(); uls.$menu.find( "div#settings-block" ).append( $displaySettings ); var position = uls.position(); @@ -136,7 +137,6 @@ } } ); - if ( !previousLang ) { previousLanguages.push( currentLang ); mw.uls.setPreviousLanguages( previousLanguages ); @@ -171,7 +171,7 @@ // Show the tipsy tooltip on page load. $ulsTrigger.tipsy( 'show' ); tipsyTimer = window.setTimeout( function () { - $ulsTrigger.tipsy('hide'); + $ulsTrigger.tipsy( 'hide' ); }, // The timeout after page reloading is longer, // to give the user a better chance to see it. diff --git a/resources/js/ext.uls.languagesettings.js b/resources/js/ext.uls.languagesettings.js index e5bd38e6..ff9a2eaa 100644 --- a/resources/js/ext.uls.languagesettings.js +++ b/resources/js/ext.uls.languagesettings.js @@ -17,7 +17,7 @@ * @licence MIT License */ -( function( $ ) { +( function ( $ ) { "use strict"; var closeRow = '
' + @@ -34,10 +34,10 @@ settingsMenu + settingsPanel + '
'; - var windowTemplate = '
' + - closeRow + - panelsRow + - '
'; + var windowTemplate = '
' + + closeRow + + panelsRow + + '
'; var LanguageSettings = function ( element, options ) { this.$element = $( element ); @@ -144,7 +144,7 @@ * Will be used when moving to a different context and * need coming back. */ - hide: function() { + hide: function () { this.shown = false; this.$window.hide(); }, @@ -153,14 +153,14 @@ * Close this language settings window, and * call onClose if defined from the previous context. */ - close: function() { + close: function () { this.hide(); if ( this.options.onClose ) { this.options.onClose(); } }, - click: function( e ) { + click: function ( e ) { if ( !this.shown ) { this.show(); } diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js index ea3c7088..d327aa72 100644 --- a/resources/js/ext.uls.webfonts.js +++ b/resources/js/ext.uls.webfonts.js @@ -19,7 +19,7 @@ ( function ( $, mw, document, undefined ) { "use strict"; - $( document ).ready( function() { + $( document ).ready( function () { var mediawikiFontRepository = $.webfonts.repository; var webfontsPreferences = mw.uls.preferences( 'webfonts' ); mediawikiFontRepository.base = mw.config.get( 'wgExtensionAssetsPath' ) @@ -43,7 +43,7 @@ } return font; }, - exclude: function() { + exclude: function () { if ( mw.user.options.get( 'editfont' ) ) { // Exclude textboxes from webfonts if user has edit area font option // set using 'Preferences' page diff --git a/tests/language_settings.html b/tests/language_settings.html index 299cebc6..93a0511f 100644 --- a/tests/language_settings.html +++ b/tests/language_settings.html @@ -1,38 +1,38 @@ - - + + - - + + - Universal Language Selector - - - - - - - - - - - - - - - - - + Universal Language Selector + + + + + + + + + + + + + + + + + - - Language Settings - + +Language Settings + diff --git a/tests/phpunit/LanguageSearchTest.php b/tests/phpunit/LanguageSearchTest.php index ef5f8eab..500ab65e 100644 --- a/tests/phpunit/LanguageSearchTest.php +++ b/tests/phpunit/LanguageSearchTest.php @@ -24,7 +24,7 @@ class LanguageSearchTest extends PHPUnit_Framework_TestCase { * @dataProvider searchDataProvider */ public function testSearch( $searchKey, $result ) { - $this->assertEquals( $result, LanguageNameSearch::search( $searchKey, 1 ) ); + $this->assertEquals( $result, LanguageNameSearch::search( $searchKey, 1 ) ); } public function searchDataProvider() { diff --git a/tests/qunit/ext.uls.tests.js b/tests/qunit/ext.uls.tests.js index 73475fa6..de5ad15c 100644 --- a/tests/qunit/ext.uls.tests.js +++ b/tests/qunit/ext.uls.tests.js @@ -18,123 +18,148 @@ */ ( function () { -"use strict"; + "use strict"; -module( "ext.uls", QUnit.newMwEnvironment() ); + module( "ext.uls", QUnit.newMwEnvironment() ); -/* - * Runs over all script codes mentioned in langdb and checks whether - * they belong to the 'Other' group. - */ -var orphanScripts = function () { - var result = []; + /* + * Runs over all script codes mentioned in langdb and checks whether + * they belong to the 'Other' group. + */ + var orphanScripts = function () { + var result = []; - for ( var language in $.uls.data.languages ) { - var script = $.uls.data.script( language ); - if ( $.uls.data.groupOfScript( script ) === 'Other' ) { - result.push( script ); + for ( var language in $.uls.data.languages ) { + var script = $.uls.data.script( language ); + if ( $.uls.data.groupOfScript( script ) === 'Other' ) { + result.push( script ); + } } - } - return result; -}; + return result; + }; -/* - * Runs over all script codes mentioned in langdb and checks whether - * they have something that looks like an autonym. - */ -var languagesWithoutAutonym = function () { - var result = []; + /* + * Runs over all script codes mentioned in langdb and checks whether + * they have something that looks like an autonym. + */ + var languagesWithoutAutonym = function () { + var result = []; - for ( var language in $.uls.data.languages ) { - if ( typeof $.uls.data.autonym( language ) !== 'string' ) { - result.push( language ); + for ( var language in $.uls.data.languages ) { + if ( typeof $.uls.data.autonym( language ) !== 'string' ) { + result.push( language ); + } } - } - return result; -}; + return result; + }; -test( "-- Initial check", function() { - expect( 1 ); - ok( $.fn.uls, "$.fn.uls is defined" ); -} ); + test( "-- Initial check", function () { + expect( 1 ); + ok( $.fn.uls, "$.fn.uls is defined" ); + } ); -test( "-- $.uls.data testing", function() { - expect( 25 ); + test( "-- $.uls.data testing", function () { + expect( 25 ); - strictEqual( $.uls.data.autonyms()['he'], 'עברית', 'Correct autonym is returned for Hebrew using autonyms().' ); + strictEqual( $.uls.data.autonyms()['he'], 'עברית', 'Correct autonym is returned for Hebrew using autonyms().' ); - // This test assumes that we don't want any scripts to be in the 'Other' - // group. Actually, this may become wrong some day. - deepEqual( orphanScripts(), [], 'All scripts belong to script groups.' ); - deepEqual( languagesWithoutAutonym(), [], 'All languages have autonyms.' ); + // This test assumes that we don't want any scripts to be in the 'Other' + // group. Actually, this may become wrong some day. + deepEqual( orphanScripts(), [], 'All scripts belong to script groups.' ); + deepEqual( languagesWithoutAutonym(), [], 'All languages have autonyms.' ); - strictEqual( - $.uls.data.groupOfScript( 'Beng' ), - 'SouthAsian', - 'Bengali script belongs to the SouthAsian group.' - ); - strictEqual( - $.uls.data.scriptGroupOfLanguage( 'iu' ), - 'NativeAmerican', - 'The script of the Inupiaq language belongs to the NativeAmerican group.' - ); + strictEqual( + $.uls.data.groupOfScript( 'Beng' ), + 'SouthAsian', + 'Bengali script belongs to the SouthAsian group.' + ); + strictEqual( + $.uls.data.scriptGroupOfLanguage( 'iu' ), + 'NativeAmerican', + 'The script of the Inupiaq language belongs to the NativeAmerican group.' + ); - 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' ); - strictEqual( $.uls.data.regions( 'no-such-language' ), 'UNKNOWN', "The region of an invalid language is 'UNKNOWN'" ); + 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' ); + strictEqual( $.uls.data.regions( 'no-such-language' ), 'UNKNOWN', "The region of an invalid language is 'UNKNOWN'" ); - var allLanguagesByRegionAndScript = $.uls.data.allLanguagesByRegionAndScript(); - deepEqual( allLanguagesByRegionAndScript['4']['AS']['SouthEastAsian']['Bugi'], ['bug'], 'All languages in the Buginese script in Asia were selected' ); + var allLanguagesByRegionAndScript = $.uls.data.allLanguagesByRegionAndScript(); + deepEqual( allLanguagesByRegionAndScript['4']['AS']['SouthEastAsian']['Bugi'], [ + 'bug' + ], 'All languages in the Buginese script in Asia were selected' ); - deepEqual( $.uls.data.languagesInRegion( "PA" ), - ["ace", "bi", "ch", "en-gb", "en", "fj", "haw", "hif-latn", "hif", "ho", "jv", - "mh", "mi", "na", "niu", "pih", "pis", "pt", "rtm", "sm", "tet", - "to", "tpi", "ty", "wls"], + deepEqual( $.uls.data.languagesInRegion( "PA" ), + [ + "ace", "bi", "ch", "en-gb", "en", "fj", "haw", "hif-latn", "hif", "ho", "jv", + "mh", "mi", "na", "niu", "pih", "pis", "pt", "rtm", "sm", "tet", + "to", "tpi", "ty", "wls" + ], "languages of region PA are selected correctly" ); - deepEqual( $.uls.data.languagesInRegions( ["AM", "WW"] ), - [ - "akz", "arn", "aro", "ase", "avk", "ay", "cho", "chr", "chy", "cr-cans", "cr-latn", "cr", - "en-ca", "en", "eo", "es-419", "es-formal", "es", "esu", "fr", - "gcf", "gn", "guc", "haw", "ht", "ia", "ie", "ik", "ike-cans", "ike-latn", "io", "iu", - "jam", "jbo", "kgp", "kl", "lad", "lfn", "mfe", "mic", "mus", "nah", "nl-informal", "nl", "nov", "nv", - "pap", "pdc", "pdt", "ppl", "pt-br", "pt", "qu", "qug", "rap", "sei", "simple", "srn", "tokipona", - "vo", "yi", "yrl", "yua" - ], - "languages of regions AM and WW are selected correctly" - ); + deepEqual( $.uls.data.languagesInRegions( ["AM", "WW"] ), + [ + "akz", "arn", "aro", "ase", "avk", "ay", "cho", "chr", "chy", "cr-cans", "cr-latn", + "cr", "en-ca", "en", "eo", "es-419", "es-formal", "es", "esu", "fr", "gcf", "gn", + "guc", "haw", "ht", "ia", "ie", "ik", "ike-cans", "ike-latn", "io", "iu", "jam", + "jbo", "kgp", "kl", "lad", "lfn", "mfe", "mic", "mus", "nah", "nl-informal", "nl", + "nov", "nv", "pap", "pdc", "pdt", "ppl", "pt-br", "pt", "qu", "qug", "rap", "sei", + "simple", "srn", "tokipona", "vo", "yi", "yrl", "yua" + ], + "languages of regions AM and WW are selected correctly" + ); - deepEqual( $.uls.data.languagesInScript( 'Knda' ), ["kn", "tcy"], "languages in script Knda are selected correctly" ); - deepEqual( $.uls.data.languagesInScripts( ['Geor', 'Armn'] ), - ["hy", "ka", "xmf"], - "languages in scripts Geor and Armn are selected correctly" - ); + deepEqual( $.uls.data.languagesInScript( 'Knda' ), [ + "kn", "tcy" + ], "languages in script Knda are selected correctly" ); + deepEqual( $.uls.data.languagesInScripts( ['Geor', 'Armn'] ), + ["hy", "ka", "xmf"], + "languages in scripts Geor and Armn are selected correctly" + ); - deepEqual( $.uls.data.regionsInGroup( 3 ), ["EU", "ME", "AF"], "regions in group 2 are selected correctly" ); - deepEqual( $.uls.data.regionsInGroup( 2 ), ["AM"], "regions in group 2 are selected correctly" ); - deepEqual( $.uls.data.regionsInGroup( 1 ), ["WW"], "regions in group 1 are selected correctly" ); + deepEqual( $.uls.data.regionsInGroup( 3 ), [ + "EU", "ME", "AF" + ], "regions in group 2 are selected correctly" ); + deepEqual( $.uls.data.regionsInGroup( 2 ), [ + "AM" + ], "regions in group 2 are selected correctly" ); + deepEqual( $.uls.data.regionsInGroup( 1 ), [ + "WW" + ], "regions in group 1 are selected correctly" ); - var languagesByScriptInAM = $.uls.data.languagesByScriptInRegion( "AM" ); - deepEqual( languagesByScriptInAM['Cans'], ["cr-cans", "cr", "ike-cans", "iu"], "correct languages in Cans in AM selected" ); + var languagesByScriptInAM = $.uls.data.languagesByScriptInRegion( "AM" ); + deepEqual( languagesByScriptInAM['Cans'], [ + "cr-cans", "cr", "ike-cans", "iu" + ], "correct languages in Cans in AM selected" ); - strictEqual( $.uls.data.autonym( 'pa' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected' ); + strictEqual( $.uls.data.autonym( 'pa' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected' ); - var languagesByScriptGroupInEMEA = $.uls.data.languagesByScriptGroupInRegions( $.uls.data.regionsInGroup( 3 ) ); - deepEqual( languagesByScriptGroupInEMEA['WestCaucasian'], ['hy', 'ka', 'xmf'], 'Correct languages in WestCaucasian script group in EMEA selected' ); + var languagesByScriptGroupInEMEA = $.uls.data.languagesByScriptGroupInRegions( $.uls.data.regionsInGroup( 3 ) ); + deepEqual( languagesByScriptGroupInEMEA['WestCaucasian'], [ + 'hy', 'ka', 'xmf' + ], 'Correct languages in WestCaucasian script group in EMEA selected' ); - var allLanguagesByScriptGroup = $.uls.data.allLanguagesByScriptGroup(); - deepEqual( allLanguagesByScriptGroup['Greek'], ['el', 'grc', 'pnt', 'ruq-grek', 'tsd'], 'All languages in the Greek script found' ); + var allLanguagesByScriptGroup = $.uls.data.allLanguagesByScriptGroup(); + deepEqual( allLanguagesByScriptGroup['Greek'], [ + 'el', 'grc', 'pnt', 'ruq-grek', 'tsd' + ], 'All languages in the Greek script found' ); - deepEqual( $.uls.data.allRegions(), ["WW", "AM", "EU", "ME", "AF", "AS", "PA"], "All regions found" ); + deepEqual( $.uls.data.allRegions(), [ + "WW", "AM", "EU", "ME", "AF", "AS", "PA" + ], "All regions found" ); - // autonyms: gn: avañe'ẽ, de: deutsch, hu: magyar, fi: suomi - deepEqual( ['de', 'fi', 'gn', 'hu'].sort( $.uls.data.sortByAutonym ), ['gn', 'de', 'hu', 'fi'], 'Languages are correctly sorted by autonym' ); + // autonyms: gn: avañe'ẽ, de: deutsch, hu: magyar, fi: suomi + deepEqual( ['de', 'fi', 'gn', 'hu'].sort( $.uls.data.sortByAutonym ), [ + 'gn', 'de', 'hu', 'fi' + ], 'Languages are correctly sorted by autonym' ); - strictEqual( $.uls.data.isRtl( "te" ), false, "Telugu language is not RTL" ); - strictEqual( $.uls.data.isRtl( "dv" ), true, "Divehi language is RTL" ); + strictEqual( $.uls.data.isRtl( "te" ), false, "Telugu language is not RTL" ); + strictEqual( $.uls.data.isRtl( "dv" ), true, "Divehi language is RTL" ); - ok( $.inArray( "sah", $.uls.data.languagesInTerritory( "RU" ) ) > -1, "Sakha language is spoken in Russia" ); -} ); + ok( $.inArray( "sah", $.uls.data.languagesInTerritory( "RU" ) ) + > -1, "Sakha language is spoken in Russia" ); + } ); }() ); diff --git a/tests/webfonts.html b/tests/webfonts.html index 19da0279..00bef1b7 100644 --- a/tests/webfonts.html +++ b/tests/webfonts.html @@ -1,117 +1,119 @@ - + - - + + -jQuery WebFonts Example - - - - - - - - - - - + + + + + - + select { + width: 200px; + height: 25px; + } + + .langselector, .fontselector { + float: left; + display: block; + } + -
-
-

jQuery WebFonts example

-
-
-
-
- Language: -
-
- Font : -
-
-
The quick brown fox jumps over the - lazy dog
-
-
+
+
+

jQuery WebFonts example

+
+
+
+
+ Language: +
+
+ Font : +
+
+
The quick brown fox jumps over the + lazy dog +
+
+