Ori.livneh has submitted this change and it was merged.
Change subject: asset-check: Use mwLoadEvent hook instead of polling modules
directly
......................................................................
asset-check: Use mwLoadEvent hook instead of polling modules directly
Follows-up 41b37bc. Depends on Ic0b1fb64ee in MediaWiki core.
Change-Id: Iaa3f2fc305753da67d01eca185e5e0b13f122675
---
M modules/webperf/files/asset-check.js
1 file changed, 1 insertion(+), 13 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Gilles: Looks good to me, but someone else must approve
diff --git a/modules/webperf/files/asset-check.js
b/modules/webperf/files/asset-check.js
index daffe7e..4df5fad 100644
--- a/modules/webperf/files/asset-check.js
+++ b/modules/webperf/files/asset-check.js
@@ -182,19 +182,7 @@
// to finish as well.
page.evaluate( function () {
/*global mw */
- var loadingPromises = mw.loader.getModuleNames()
- .filter( function ( name ) {
- return mw.loader.getState( name ) ===
'loading';
- } )
- .map( function ( name ) {
- return mw.loader.using( name ).then(
null, function () {
- // In order to use the
jQuery.when utility and it to not
- // call back on the first error
when other modules are
- // still pending, cast any
error to success.
- return $.Deferred().resolve();
- } );
- } );
- $.when.apply( $, loadingPromises ).then( function () {
+ mw.hook( 'resourceloader.loadEnd' ).add( function () {
window.callPhantom( 'mw-modules-ready' );
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/235956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa3f2fc305753da67d01eca185e5e0b13f122675
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
