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

Use single entry point mw.uls.init for all ULS ui initialization

Browse Source 
Change-Id: I485ea27deebb530eb89e4b0935eda01a5276f884
This commit is contained in:
Santhosh Thottingal
2013-07-04 18:27:32 +05:30
committed by Amire80
parent ea50b8216c
commit 8ddff0b2fc
4 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
resources/js/ext.uls.ime.js
View File

@@ -203,17 +203,14 @@
}; };
$( document ).ready( function () { $( document ).ready( function () {
if ( !mw.uls.isBrowserSupported() ) { mw.uls.init( function () {
return; // Load the ime preferences
} $.ime.preferences.load();
// Load the ime preferences
$.ime.preferences.load();
if ( $.ime.preferences.isEnabled() ) {
mw.ime.setup();
}
if ( $.ime.preferences.isEnabled() ) {
mw.ime.setup();
}
} );
} ); } );
function imeNotification () { function imeNotification () {

23
resources/js/ext.uls.init.js
View File

@@ -31,7 +31,8 @@
this.$languageFilter.addClass( 'noime' ); this.$languageFilter.addClass( 'noime' );
}; };
var currentLang = mw.config.get( 'wgUserLanguage' ); var initialized = false,
currentLang = mw.config.get( 'wgUserLanguage' );
mw.uls = mw.uls || {}; mw.uls = mw.uls || {};
mw.uls.previousLanguagesCookie = 'uls-previous-languages'; mw.uls.previousLanguagesCookie = 'uls-previous-languages';
/** /**
@@ -139,10 +140,10 @@
* Browse support policy: http://www.mediawiki.org/wiki/Browser_support#Grade_A * Browse support policy: http://www.mediawiki.org/wiki/Browser_support#Grade_A
* @return boolean * @return boolean
*/ */
mw.uls.isBrowserSupported = function () { function isBrowserSupported() {
// Blacklist Grade B browsers IE 6, 7 and IE60-IE79 // Blacklist Grade B browsers IE 6, 7 and IE60-IE79
return !/MSIE [67]/i.test( navigator.userAgent ); return !/MSIE [67]/i.test( navigator.userAgent );
}; }
/** /**
* Local wrapper for 'mw.eventLog.logEvent' which handles default params * Local wrapper for 'mw.eventLog.logEvent' which handles default params
@@ -187,8 +188,14 @@
.load( jsonLoader + currentLang, currentLang ); .load( jsonLoader + currentLang, currentLang );
} }
$( document ).ready( function () { mw.uls.init = function( callback ) {
if ( !mw.uls.isBrowserSupported() ) { callback = callback || $.noop;
if ( initialized ) {
callback.call( this, false );
return;
}
if ( !isBrowserSupported() ) {
$( '#pt-uls' ).hide(); $( '#pt-uls' ).hide();
return; return;
} }
@@ -205,5 +212,11 @@
// JavaScript side i18n initialization // JavaScript side i18n initialization
i18nInit(); i18nInit();
initialized = true;
callback.call( this, true );
};
$( document ).ready( function () {
mw.uls.init();
} ); } );
}( jQuery, mediaWiki ) ); }( jQuery, mediaWiki ) );

6
resources/js/ext.uls.interface.js
View File

@@ -223,6 +223,7 @@
} }
$( document ).ready( function () { $( document ).ready( function () {
mw.uls.init( function () {
var $ulsTrigger = $( '.uls-trigger' ), var $ulsTrigger = $( '.uls-trigger' ),
$ulsSettingsTrigger, $ulsSettingsTrigger,
$pLang, $pLang,
@@ -232,10 +233,6 @@
!mw.config.get( 'wgULSAnonCanChangeLanguage' ) ), !mw.config.get( 'wgULSAnonCanChangeLanguage' ) ),
ulsPosition = mw.config.get( 'wgULSPosition' ); ulsPosition = mw.config.get( 'wgULSPosition' );
if ( !mw.uls.isBrowserSupported() ) {
return;
}
if ( ulsPosition === 'interlanguage' ) { if ( ulsPosition === 'interlanguage' ) {
// The interlanguage links section // The interlanguage links section
$pLang = $( '#p-lang' ); $pLang = $( '#p-lang' );
@@ -330,4 +327,5 @@
showULSTooltip(); showULSTooltip();
} ); } );
} );
}( jQuery, mediaWiki ) ); }( jQuery, mediaWiki ) );

21
resources/js/ext.uls.webfonts.js
View File

@@ -81,17 +81,16 @@
}; };
$( document ).ready( function () { $( document ).ready( function () {
if ( !mw.uls.isBrowserSupported() ) { mw.uls.init( function () {
return;
} // MediaWiki specific overrides for jquery.webfonts
// MediaWiki specific overrides for jquery.webfonts $.extend( $.fn.webfonts.defaults, {
$.extend( $.fn.webfonts.defaults, { repository: mediawikiFontRepository,
repository: mediawikiFontRepository, fontStack: new Array( $( 'body' ).css( 'font-family' ) )
fontStack: new Array( $( 'body' ).css( 'font-family' ) ) } );
mw.webfonts.preferences.load();
mw.webfonts.setup();
} ); } );
mw.webfonts.preferences.load();
mw.webfonts.setup();
} ); } );
}( jQuery, mediaWiki ) ); }( jQuery, mediaWiki ) );