jenkins-bot has submitted this change and it was merged.
Change subject: Earlier evaluation of compactlinks
......................................................................
Earlier evaluation of compactlinks
* Prospectively load ext.uls.init
* Prospectively check if readyState is interactive
Bug: T136463
Change-Id: Ib36ef6a2b9955189acfbe06bd6b498a66014cf06
---
M extension.json
M resources/js/ext.uls.compactlinks.js
M resources/js/ext.uls.interface.js
3 files changed, 30 insertions(+), 17 deletions(-)
Approvals:
Amire80: Looks good to me, approved
Eranroz: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index c765538..c0479d0 100644
--- a/extension.json
+++ b/extension.json
@@ -245,7 +245,8 @@
"dependencies": [
"es5-shim",
"mediawiki.language",
- "mediawiki.ui.button"
+ "mediawiki.ui.button",
+ "ext.uls.init"
],
"messages": [
"ext-uls-compact-link-count",
diff --git a/resources/js/ext.uls.compactlinks.js
b/resources/js/ext.uls.compactlinks.js
index abb827f..23c5243 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -64,15 +64,13 @@
return;
}
- mw.loader.using( 'ext.uls.init' ).done( function () {
- // If we're only a bit beyond max, limit to 7 instead
of 9.
- // FIXME: This assumes the max is 9.
- self.compactSize = ( self.listSize <= 12 ) ? 7 : max;
- self.compactList = self.getCompactList();
- self.hideOriginal();
- self.render();
- self.listen();
- } );
+ // If we're only a bit beyond max, limit to 7 instead of 9.
+ // FIXME: This assumes the max is 9.
+ self.compactSize = ( self.listSize <= 12 ) ? 7 : max;
+ self.compactList = self.getCompactList();
+ self.hideOriginal();
+ self.render();
+ self.listen();
};
/**
@@ -450,13 +448,20 @@
this.$trigger = $trigger;
};
- $( document ).ready( function () {
- var compactList;
-
- compactList = new CompactInterlanguageList( $( '#p-lang ul' ), {
+ function createCompactList() {
+ var compactList = new CompactInterlanguageList( $( '#p-lang ul'
), {
// Compact the list to this size
max: 9
} );
compactList.init();
- } );
+
+ }
+
+ // Early execute of createCompactList
+ if ( document.readyState === 'interactive' ) {
+ createCompactList();
+ } else {
+ $( document ).ready( createCompactList );
+ }
+
}( jQuery, mediaWiki ) );
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index 53d64a2..8fe644b 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -508,9 +508,16 @@
} );
}
- $( document ).ready( function () {
+ function init() {
initInterface();
initTooltip();
initIme();
- } );
+ }
+
+ // Early execute of init
+ if ( document.readyState === 'interactive' ) {
+ init();
+ } else {
+ $( document ).ready( init );
+ }
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/299285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib36ef6a2b9955189acfbe06bd6b498a66014cf06
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Eranroz <eranro...@gmail.com>
Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: Eranroz <eranro...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
