jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Introduce window.NORLQ
......................................................................
resourceloader: Introduce window.NORLQ
Bug: T123457
Change-Id: Ice6ebb95bfcb2050f4813705467942f95f7e720c
---
M resources/src/startup.js
1 file changed, 26 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/startup.js b/resources/src/startup.js
index 0c2d6d6..e53e5f3 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -4,7 +4,7 @@
* even the most ancient of browsers, so be very careful when editing.
*/
/*jshint unused: false, evil: true */
-/*globals mw, RLQ: true, $VARS, $CODE, performance */
+/*globals mw, RLQ: true, NORLQ: true, $VARS, $CODE, performance */
var mediaWikiLoadStart = ( new Date() ).getTime(),
@@ -67,11 +67,29 @@
// Conditional script injection
( function () {
+ var NORLQ, script;
if ( !isCompatible() ) {
// Undo class swapping in case of an unsupported browser.
// See OutputPage::getHeadScripts().
document.documentElement.className =
document.documentElement.className
.replace( /(^|\s)client-js(\s|$)/, '$1client-nojs$2' );
+
+ NORLQ = window.NORLQ || [];
+ while ( NORLQ.length ) {
+ NORLQ.shift()();
+ }
+ window.NORLQ = {
+ push: function ( fn ) {
+ fn();
+ }
+ };
+
+ // Clear and disable the other queue
+ window.RLQ = {
+ // No-op
+ push: function () {}
+ };
+
return;
}
@@ -96,9 +114,15 @@
fn();
}
};
+
+ // Clear and disable the other queue
+ window.NORLQ = {
+ // No-op
+ push: function () {}
+ };
}
- var script = document.createElement( 'script' );
+ script = document.createElement( 'script' );
script.src = $VARS.baseModulesUri;
script.onload = script.onreadystatechange = function () {
if ( !script.readyState || /loaded|complete/.test(
script.readyState ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/265878
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice6ebb95bfcb2050f4813705467942f95f7e720c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
