Whitespace

This commit is contained in:
Amir E. Aharoni
2013-01-02 16:28:42 +02:00
parent 680e14196d
commit 1f91a4c40c
3 changed files with 83 additions and 56 deletions

View File

@@ -199,6 +199,7 @@
if ( $.inArray( region, $.uls.data.getRegions( language ) ) !== -1 ) { if ( $.inArray( region, $.uls.data.getRegions( language ) ) !== -1 ) {
var script = $.uls.data.getScript( language ); var script = $.uls.data.getScript( language );
if ( languagesByScriptInRegion[script] === undefined ) { if ( languagesByScriptInRegion[script] === undefined ) {
languagesByScriptInRegion[script] = []; languagesByScriptInRegion[script] = [];
} }
@@ -243,12 +244,15 @@
for ( scriptGroup in $.uls.data.scriptgroups ) { for ( scriptGroup in $.uls.data.scriptgroups ) {
for ( language in languages ) { for ( language in languages ) {
langScriptGroup = $.uls.data.getScriptGroupOfLanguage( language ); langScriptGroup = $.uls.data.getScriptGroupOfLanguage( language );
if ( langScriptGroup !== scriptGroup ) { if ( langScriptGroup !== scriptGroup ) {
continue; continue;
} }
if ( !languagesByScriptGroup[scriptGroup] ) { if ( !languagesByScriptGroup[scriptGroup] ) {
languagesByScriptGroup[scriptGroup] = []; languagesByScriptGroup[scriptGroup] = [];
} }
languagesByScriptGroup[scriptGroup].push( language ); languagesByScriptGroup[scriptGroup].push( language );
} }
} }
@@ -387,6 +391,7 @@
$.uls.data.sortByAutonym = function ( a, b ) { $.uls.data.sortByAutonym = function ( a, b ) {
var autonymA = $.uls.data.getAutonym( a ) || a, var autonymA = $.uls.data.getAutonym( a ) || a,
autonymB = $.uls.data.getAutonym( b ) || b; autonymB = $.uls.data.getAutonym( b ) || b;
return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1; return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1;
}; };
@@ -416,5 +421,4 @@
$.uls.data.getLanguagesInTerritory = function ( territory ) { $.uls.data.getLanguagesInTerritory = function ( territory ) {
return $.uls.data.territories[territory]; return $.uls.data.territories[territory];
}; };
} ( jQuery ) ); } ( jQuery ) );

View File

@@ -20,7 +20,7 @@
*/ */
( function ( $ ) { ( function ( $ ) {
"use strict"; 'use strict';
var noResultsTemplate = '\ var noResultsTemplate = '\
<div class="twelve columns uls-no-results-view">\ <div class="twelve columns uls-no-results-view">\
@@ -120,6 +120,7 @@
$column.append( $li ); $column.append( $li );
} }
}, },
/** /**
* Get a column to add language. * Get a column to add language.
* @param regionCode string The region code * @param regionCode string The region code
@@ -167,9 +168,11 @@
$.each( $.uls.data.regiongroups, function ( regionCode, regionIndex ) { $.each( $.uls.data.regiongroups, function ( regionCode, regionIndex ) {
$section = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).prop( 'id', regionCode ); $section = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).prop( 'id', regionCode );
$sectionTitle = $( '<h3 data-i18n="uls-region-' + regionCode + '">' ) $sectionTitle = $( '<h3 data-i18n="uls-region-' + regionCode + '">' )
.addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' ) .addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' )
.text( regions[regionCode] ); .text( regions[regionCode] );
$section.append( $sectionTitle ); $section.append( $sectionTitle );
lcd.$element.append( $section ); lcd.$element.append( $section );
$section.hide(); $section.hide();
@@ -197,6 +200,7 @@
var quickList = this.options.quickList; var quickList = this.options.quickList;
quickList = quickList.slice( 0, 16 ); quickList = quickList.slice( 0, 16 );
quickList.sort( $.uls.data.sortByAutonym ); quickList.sort( $.uls.data.sortByAutonym );
var $quickListSection = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).prop( 'id', 'uls-lcd-quicklist' ); var $quickListSection = $( '<div>' ).addClass( 'twelve columns uls-lcd-region-section' ).prop( 'id', 'uls-lcd-quicklist' );
var $quickListSectionTitle = $( '<h3 data-i18n="uls-common-languages">' ) var $quickListSectionTitle = $( '<h3 data-i18n="uls-common-languages">' )
.addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' ) .addClass( 'eleven columns uls-lcd-region-section uls-lcd-region-title offset-by-one' )
@@ -204,6 +208,7 @@
$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 );
var langCode = quickList[i]; var langCode = quickList[i];
@@ -220,8 +225,10 @@
); );
$column.append( $li ); $column.append( $li );
} }
$quickListSection.show(); $quickListSection.show();
$quickListSectionTitle.i18n(); $quickListSectionTitle.i18n();
return $quickListSection; return $quickListSection;
}, },
@@ -264,6 +271,7 @@
var $ulsLanguageList = $( this ), var $ulsLanguageList = $( this ),
scrollTop = $ulsLanguageList.position().top, scrollTop = $ulsLanguageList.position().top,
scrollBottom = $ulsLanguageList.height(); scrollBottom = $ulsLanguageList.height();
if ( lcd.options.lazyload && lcd.options.source.val() === '' ) { if ( lcd.options.lazyload && lcd.options.source.val() === '' ) {
if ( this.offsetHeight + this.scrollTop >= this.scrollHeight / 2 ) { if ( this.offsetHeight + this.scrollTop >= this.scrollHeight / 2 ) {
lcd.$element.trigger( 'scrollend' ); lcd.$element.trigger( 'scrollend' );
@@ -279,6 +287,7 @@
if ( top - padding <= scrollTop && height > scrollBottom ) { if ( top - padding <= scrollTop && height > scrollBottom ) {
inviewRegion = $lcdRegionSection.attr( 'id' ); inviewRegion = $lcdRegionSection.attr( 'id' );
return true; return true;
} }
} ); } );
@@ -299,6 +308,7 @@
if ( !data ) { if ( !data ) {
$this.data( 'lcd', ( data = new LanguageCategoryDisplay( this, options ) ) ); $this.data( 'lcd', ( data = new LanguageCategoryDisplay( this, options ) ) );
} }
if ( typeof option === 'string') { if ( typeof option === 'string') {
data[option](); data[option]();
} }

View File

@@ -45,6 +45,7 @@
init: function () { init: function () {
var region = this.$element.data( 'region' ); var region = this.$element.data( 'region' );
this.regions = $.uls.data.getRegionsInGroup( this.regionGroup ); this.regions = $.uls.data.getRegionsInGroup( this.regionGroup );
if ( region ) { if ( region ) {
this.regions.push( region ); this.regions.push( region );
} }
@@ -56,9 +57,11 @@
for ( var i = 0; i < this.regions.length; i++ ) { for ( var i = 0; i < this.regions.length; i++ ) {
region = this.regions[i]; region = this.regions[i];
if ( $.inArray( region, langRegions ) >= 0 ) { if ( $.inArray( region, langRegions ) >= 0 ) {
this.render( langCode, region ); this.render( langCode, region );
this.cache[langCode] = region; this.cache[langCode] = region;
return; return;
} }
} }
@@ -68,6 +71,7 @@
if ( this.cache ) { if ( this.cache ) {
// If the result cache is present, render the results from there. // If the result cache is present, render the results from there.
var result = null; var result = null;
for ( result in this.cache ) { for ( result in this.cache ) {
this.render( result, this.cache[result] ); this.render( result, this.cache[result] );
} }
@@ -75,11 +79,14 @@
this.cache = {}; this.cache = {};
// Get the languages grouped by script group // Get the languages grouped by script group
var languagesByScriptGroup = $.uls.data.getLanguagesByScriptGroup( this.options.languages ); var languagesByScriptGroup = $.uls.data.getLanguagesByScriptGroup( this.options.languages );
for ( var scriptGroup in languagesByScriptGroup ) { for ( var scriptGroup in languagesByScriptGroup ) {
// Get the languages for the script group // Get the languages for the script group
var languages = languagesByScriptGroup[scriptGroup]; var languages = languagesByScriptGroup[scriptGroup];
// Sort it based on autonym // Sort it based on autonym
languages.sort( $.uls.data.sortByAutonym ); languages.sort( $.uls.data.sortByAutonym );
for ( var i = 0; i < languages.length; i++ ) { for ( var i = 0; i < languages.length; i++ ) {
// Check whether it belongs to the region // Check whether it belongs to the region
this.test( languages[i] ); this.test( languages[i] );
@@ -94,9 +101,11 @@
render: function ( langCode, region ) { render: function ( langCode, region ) {
var $target = this.options.$target; var $target = this.options.$target;
if ( !$target ) { if ( !$target ) {
return; return;
} }
$target.append( langCode, region ); $target.append( langCode, region );
}, },
@@ -113,10 +122,12 @@
var $nextRegion = $( '#uls-region-' + nextRegiongroup ); var $nextRegion = $( '#uls-region-' + nextRegiongroup );
var next = $nextRegion.length && $nextRegion.data( 'regionselector' ); var next = $nextRegion.length && $nextRegion.data( 'regionselector' );
if ( next ) { if ( next ) {
next.show(); next.show();
} }
}, 100 ); }, 100 );
return false; return false;
}, },
@@ -136,6 +147,7 @@
this.show(); this.show();
// Make the selected region (and it only) active // Make the selected region (and it only) active
$( '.regionselector' ).removeClass( 'active' ); $( '.regionselector' ).removeClass( 'active' );
if ( this.regionGroup ) { if ( this.regionGroup ) {
// if there is a region group, make it active. // if there is a region group, make it active.
this.$element.addClass( 'active' ); this.$element.addClass( 'active' );
@@ -154,6 +166,7 @@
if ( !data ) { if ( !data ) {
$this.data( 'regionselector', ( data = new RegionSelector( this, options ) ) ); $this.data( 'regionselector', ( data = new RegionSelector( this, options ) ) );
} }
if ( typeof option === 'string' ) { if ( typeof option === 'string' ) {
data[option](); data[option]();
} }