Update the remaining calls to deprecated functions

This commit is contained in:
Amir E. Aharoni
2012-10-08 08:27:50 +02:00
parent faeac72491
commit c40caf4a29
4 changed files with 32 additions and 32 deletions

View File

@@ -193,7 +193,7 @@
* @return array of strings (languages codes)
*/
$.uls.data.getLanguagesInRegionGroup = function( groupNum ) {
return $.uls.data.getLanguagesInRegions( $.uls.data.regionsInGroup( groupNum ) );
return $.uls.data.getLanguagesInRegions( $.uls.data.getRegionsInGroup( groupNum ) );
};
$.uls.data.languagesInRegionGroup = function( groupNum ) { // deprecated
@@ -270,7 +270,7 @@
for ( scriptGroup in $.uls.data.scriptgroups ) {
for ( language in languages ) {
langScriptGroup = $.uls.data.scriptGroupOfLanguage( language );
langScriptGroup = $.uls.data.getScriptGroupOfLanguage( language );
if( langScriptGroup !== scriptGroup ) {
continue;
}
@@ -301,7 +301,7 @@
for ( var language in $.uls.data.languages ) {
for ( var i = 0; i < regions.length; i++ ) {
if ( $.inArray( regions[i], $.uls.data.getRegions( language ) ) !== -1 ) {
var scriptGroup = $.uls.data.scriptGroupOfLanguage( language );
var scriptGroup = $.uls.data.getScriptGroupOfLanguage( language );
if ( languagesByScriptGroupInRegions[scriptGroup] === undefined ) {
languagesByScriptGroupInRegions[scriptGroup] = [];
}
@@ -339,7 +339,7 @@
for ( var language in $.uls.data.languages ) {
var script = $.uls.data.getScript( language );
var scriptGroup = $.uls.data.groupOfScript( script );
var scriptGroup = $.uls.data.getGroupOfScript( script );
var regions = $.uls.data.getRegions( language );
for ( var regionNum = 0; regionNum < regions.length; regionNum++ ) {
@@ -415,7 +415,7 @@
* @return string script group name
*/
$.uls.data.getScriptGroupOfLanguage = function( language ) {
return $.uls.data.groupOfScript( $.uls.data.getScript( language ) );
return $.uls.data.getGroupOfScript( $.uls.data.getScript( language ) );
};
$.uls.data.scriptGroupOfLanguage = function( language ) { // deprecated

View File

@@ -106,8 +106,8 @@
var lastLanguage = $column.find( 'li:last' ).data( 'code' );
if ( lastLanguage ) {
var lastScriptGroup = $.uls.data.scriptGroupOfLanguage( lastLanguage ),
currentScriptGroup = $.uls.data.scriptGroupOfLanguage( langCode );
var lastScriptGroup = $.uls.data.getScriptGroupOfLanguage( lastLanguage ),
currentScriptGroup = $.uls.data.getScriptGroupOfLanguage( langCode );
if ( lastScriptGroup !== currentScriptGroup ) {
if ( $column.find( 'li' ).length > 2 ) {

View File

@@ -17,7 +17,7 @@
* @licence MIT License
*/
(function ( $ ) {
( function ( $ ) {
"use strict";
/* RegionSelector plugin definition */
@@ -44,7 +44,7 @@
init: function() {
var region = this.$element.data( 'region' );
this.regions = $.uls.data.regionsInGroup( this.regionGroup );
this.regions = $.uls.data.getRegionsInGroup( this.regionGroup );
if ( region ) {
this.regions.push( region );
}