From ff072210741dd574bd31eee9849197f854a84b0a Mon Sep 17 00:00:00 2001 From: Krinkle Date: Tue, 27 Dec 2011 02:44:02 +0000 Subject: [PATCH] [mediawiki.js] Always pass error info to error callbacks in mw.loader * Fix for handlePending() provided by Michael Dale * Fixes (bug 30709) Always pass error info to error callbacks in mw.loader --- resources/mediawiki/mediawiki.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js index fe4a7199a8..f651056363 100644 --- a/resources/mediawiki/mediawiki.js +++ b/resources/mediawiki/mediawiki.js @@ -616,7 +616,7 @@ window.mw = window.mediaWiki = new ( function( $, undefined ) { for ( var j = 0; j < jobs.length; j++ ) { if ( $.inArray( module, jobs[j].dependencies ) !== -1 ) { if ( $.isFunction( jobs[j].error ) ) { - jobs[j].error(); + jobs[j].error( e, module ); } jobs.splice( j, 1 ); j--; @@ -1053,7 +1053,8 @@ window.mw = window.mediaWiki = new ( function( $, undefined ) { // If any dependencies have errors execute error immediately else if ( filter( ['error'], dependencies ).length ) { if ( $.isFunction( error ) ) { - error(); + error( new Error( 'one or more dependencies have state "error"' ), + dependencies ); } } // Since some dependencies are not yet ready, queue up a request -- 2.20.1