Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93926
Change subject: Lazyload jquery.uls library
......................................................................
Lazyload jquery.uls library
ULS language selection is showed after 2 clicks if the ULS
position is interlanguage. So dont load it initially.
But language selection screen is shown immediately after language
icon click in 'personal' position, So load it conditionally
Change-Id: Ic33ef034c794a523b5403867196c6098a58eb5b1
---
M Resources.php
M resources/js/ext.uls.init.js
M resources/js/ext.uls.interface.js
3 files changed, 25 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/26/93926/1
diff --git a/Resources.php b/Resources.php
index f5d4d99..ad38d71 100644
--- a/Resources.php
+++ b/Resources.php
@@ -30,6 +30,7 @@
'ext.uls.buttons',
'ext.uls.languagesettings',
'ext.uls.webfonts',
+ 'jquery.uls',
'jquery.uls.grid',
'jquery.i18n',
'mediawiki.api.parse',
@@ -45,6 +46,7 @@
'dependencies' => array(
'ext.uls.init',
'ext.uls.preferences',
+ 'jquery.uls',
'jquery.ime',
),
'messages' => array(
@@ -72,7 +74,7 @@
'jquery.client',
'jquery.json',
'jquery.cookie',
- 'jquery.uls',
+ 'jquery.uls.data',
'ext.uls.messages',
),
'position' => 'top',
@@ -95,6 +97,7 @@
'ext.uls.buttons',
'ext.uls.languagesettings',
'ext.uls.ime',
+ 'jquery.uls',
'jquery.uls.grid',
'jquery.ime',
'jquery.i18n',
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 42b4b55..37a1a10 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -40,16 +40,6 @@
}() );
}
- // MediaWiki override for ULS defaults.
- $.fn.uls.defaults = $.extend( $.fn.uls.defaults, {
- languages: mw.config.get( 'wgULSLanguages' ),
- searchAPI: mw.util.wikiScript( 'api' ) +
'?action=languagesearch'
- } );
-
- // No need of IME in language search bar of ULS
- $.fn.uls.Constructor.prototype.render = function () {
- this.$languageFilter.addClass( 'noime' );
- };
var jsonLoader = null,
initialized = false,
@@ -59,6 +49,18 @@
mw.uls.previousLanguagesCookie = 'uls-previous-languages';
mw.uls.languageSettingsModules = ['ext.uls.inputsettings',
'ext.uls.displaysettings'];
+ mw.uls.config = function () {
+ // MediaWiki override for ULS defaults.
+ $.fn.uls.defaults = $.extend( $.fn.uls.defaults, {
+ languages: mw.config.get( 'wgULSLanguages' ),
+ searchAPI: mw.util.wikiScript( 'api' ) +
'?action=languagesearch'
+ } );
+
+ // No need of IME in language search bar of ULS
+ $.fn.uls.Constructor.prototype.render = function () {
+ this.$languageFilter.addClass( 'noime' );
+ };
+ };
// What was the last thing that the user did to select the language:
// * 'map' - clicked the map
// * 'search' - typed in the search box
@@ -278,5 +280,10 @@
$( document ).ready( function () {
mw.uls.init();
+ if ( mw.config.get( 'wgULSPosition' ) === 'personal' ) {
+ mw.loader.using( ['jquery.uls.grid', 'jquery.uls'],
function () {
+ mw.uls.config();
+ } );
+ }
} );
}( jQuery, mediaWiki ) );
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index 93d9b07..837f849 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -374,6 +374,7 @@
};
mw.loader.using(
mw.uls.languageSettingsModules, function () {
+ mw.uls.config();
$ulsTrigger.languagesettings( languageSettingsOptions ).click();
} );
@@ -390,6 +391,7 @@
}
} else {
mw.loader.using(
mw.uls.languageSettingsModules, function () {
+ mw.uls.config();
$ulsTrigger.languagesettings();
$ulsTrigger.trigger(
'click', eventParams );
@@ -414,6 +416,7 @@
onReady: function () {
var uls = this;
mw.loader.using( mw.uls.languageSettingsModules, function () {
+
mw.uls.config();
addDisplaySettings( uls );
addInputSettings( uls );
} );
@@ -451,6 +454,7 @@
var $input = $( this );
$( 'body' ).off( '.imeinit' );
mw.loader.using( 'ext.uls.ime', function () {
+ mw.uls.config();
mw.ime.setup();
mw.ime.handleFocus( $input );
} );
--
To view, visit https://gerrit.wikimedia.org/r/93926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic33ef034c794a523b5403867196c6098a58eb5b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
