var results, i;
fallback = arguments.length > 1 ? fallback : null;
- if ( $.isArray( selection ) ) {
+ if ( Array.isArray( selection ) ) {
results = {};
for ( i = 0; i < selection.length; i++ ) {
if ( typeof selection[ i ] === 'string' ) {
*/
exists: function ( selection ) {
var i;
- if ( $.isArray( selection ) ) {
+ if ( Array.isArray( selection ) ) {
for ( i = 0; i < selection.length; i++ ) {
if ( typeof selection[ i ] !== 'string' || !hasOwn.call( this.values, selection[ i ] ) ) {
return false;
/* eslint-disable no-console */
log = ( function () {
- // Also update the restoration of methods in mediawiki.log.js
- // when adding or removing methods here.
+ /**
+ * Write a verbose message to the browser's console in debug mode.
+ *
+ * This method is mainly intended for verbose logging. It is a no-op in production mode.
+ * In ResourceLoader debug mode, it will use the browser's console if available, with
+ * fallback to creating a console interface in the DOM and logging messages there.
+ *
+ * See {@link mw.log} for other logging methods.
+ *
+ * @member mw
+ * @param {...string} msg Messages to output to console.
+ */
var log = function () {},
console = window.console;
+ // Note: Keep list of methods in sync with restoration in mediawiki.log.js
+ // when adding or removing mw.log methods below!
+
/**
+ * Collection of methods to help log messages to the console.
+ *
* @class mw.log
* @singleton
*/
/**
- * Write a message to the console's warning channel.
- * Actions not supported by the browser console are silently ignored.
+ * Write a message to the browser console's warning channel.
+ *
+ * This method is a no-op in browsers that don't implement the Console API.
*
* @param {...string} msg Messages to output to console
*/
$.noop;
/**
- * Write a message to the console's error channel.
+ * Write a message to the browser console's error channel.
+ *
+ * Most browsers also print a stacktrace when calling this method if the
+ * argument is an Error object.
*
- * Most browsers provide a stacktrace by default if the argument
- * is a caught Error object.
+ * This method is a no-op in browsers that don't implement the Console API.
*
* @since 1.26
* @param {Error|...string} msg Messages to output to console
$.noop;
/**
- * Create a property in a host object that, when accessed, will produce
+ * Create a property on a host object that, when accessed, will produce
* a deprecation warning in the console.
*
* @param {Object} obj Host object of deprecated property
return mw.message.apply( mw.message, arguments ).toString();
},
- /**
- * No-op dummy placeholder for {@link mw.log} in debug mode.
- *
- * @method
- */
+ // Expose mw.log
log: log,
/**
* is used)
* - load-callback: exception thrown by user callback
* - module-execute: exception thrown by module code
+ * - resolve: failed to sort dependencies for a module in mw.loader.load
* - store-eval: could not evaluate module code cached in localStorage
* - store-localstorage-init: localStorage or JSON parse error in mw.loader.store.init
* - store-localstorage-json: JSON conversion error in mw.loader.store.set
cssBuffer = '',
cssBufferTimer = null,
cssCallbacks = $.Callbacks(),
- isIE9 = document.documentMode === 9,
rAF = window.requestAnimationFrame || setTimeout;
function getMarker() {
* @param {Function} [callback]
*/
function addEmbeddedCSS( cssText, callback ) {
- var $style, styleEl;
-
function fireCallbacks() {
var oldCallbacks = cssCallbacks;
// Reset cssCallbacks variable so it's not polluted by any calls to
cssBuffer = '';
}
- // By default, always create a new <style>. Appending text to a <style> tag is
- // is a performance anti-pattern as it requires CSS to be reparsed (T47810).
- //
- // Support: IE 6-9
- // Try to re-use existing <style> tags due to the IE stylesheet limit (T33676).
- if ( isIE9 ) {
- $style = $( getMarker() ).prev();
- // Verify that the element before the marker actually is a <style> tag created
- // by mw.loader (not some other style tag, or e.g. a <meta> tag).
- if ( $style.data( 'ResourceLoaderDynamicStyleTag' ) ) {
- styleEl = $style[ 0 ];
- styleEl.appendChild( document.createTextNode( cssText ) );
- fireCallbacks();
- return;
- }
- // Else: No existing tag to reuse. Continue below and create the first one.
- }
-
- $style = $( newStyleTag( cssText, getMarker() ) );
-
- if ( isIE9 ) {
- $style.data( 'ResourceLoaderDynamicStyleTag', true );
- }
+ $( newStyleTag( cssText, getMarker() ) );
fireCallbacks();
}
* @return {string} Hash of concatenated version hashes.
*/
function getCombinedVersion( modules ) {
- var hashes = $.map( modules, function ( module ) {
+ var hashes = modules.map( function ( module ) {
return registry[ module ].version;
} );
return fnv132( hashes.join( '' ) );
return resolved;
}
+ /**
+ * Like #resolve(), except it will silently ignore modules that
+ * are missing or have missing dependencies.
+ *
+ * @private
+ * @param {string[]} modules Array of string module names
+ * @return {Array} List of dependencies.
+ */
+ function resolveStubbornly( modules ) {
+ var i, saved, resolved = [];
+ for ( i = 0; i < modules.length; i++ ) {
+ saved = resolved.slice();
+ try {
+ sortDependencies( modules[ i ], resolved );
+ } catch ( err ) {
+ // This module is unknown or has unknown dependencies.
+ // Undo any incomplete resolutions made and keep going.
+ resolved = saved;
+ mw.track( 'resourceloader.exception', {
+ exception: err,
+ source: 'resolve'
+ } );
+ }
+ }
+ return resolved;
+ }
+
/**
* Load and execute a script.
*
el.media = media;
}
// If you end up here from an IE exception "SCRIPT: Invalid property value.",
- // see #addEmbeddedCSS, T33676, and T49277 for details.
+ // see #addEmbeddedCSS, T33676, T43331, and T49277 for details.
el.href = url;
$( getMarker() ).before( el );
registry[ module ].state = 'executing';
runScript = function () {
- var script, markModuleReady, nestedAddScript, legacyWait, implicitDependencies,
- // Expand to include dependencies since we have to exclude both legacy modules
- // and their dependencies from the legacyWait (to prevent a circular dependency).
- legacyModules = resolve( mw.config.get( 'wgResourceLoaderLegacyModules', [] ) );
+ var script, markModuleReady, nestedAddScript, implicitDependencies, implicitWait;
script = registry[ module ].script;
markModuleReady = function () {
} );
};
- implicitDependencies = ( $.inArray( module, legacyModules ) !== -1 ) ?
- [] :
- legacyModules;
+ implicitDependencies = [];
if ( module === 'user' ) {
// Implicit dependency on the site module. Not real dependency because
implicitDependencies.push( 'site' );
}
- legacyWait = implicitDependencies.length ?
+ implicitWait = implicitDependencies.length ?
mw.loader.using( implicitDependencies ) :
$.Deferred().resolve();
- legacyWait.always( function () {
+ implicitWait.always( function () {
try {
- if ( $.isArray( script ) ) {
+ if ( Array.isArray( script ) ) {
nestedAddScript( script, markModuleReady, 0 );
} else if ( typeof script === 'function' ) {
// Pass jQuery twice so that the signature of the closure which wraps
// Array of css strings in key 'css',
// or back-compat array of urls from media-type
- if ( $.isArray( value ) ) {
+ if ( Array.isArray( value ) ) {
for ( i = 0; i < value.length; i++ ) {
if ( key === 'bc-url' ) {
// back-compat: { <media>: [url, ..] }
/**
* Load an external script or one or more modules.
*
+ * This method takes a list of unrelated modules. Use cases:
+ *
+ * - A web page will be composed of many different widgets. These widgets independently
+ * queue their ResourceLoader modules (`OutputPage::addModules()`). If any of them
+ * have problems, or are no longer known (e.g. cached HTML), the other modules
+ * should still be loaded.
+ * - This method is used for preloading, which must not throw. Later code that
+ * calls #using() will handle the error.
+ *
* @param {string|Array} modules Either the name of a module, array of modules,
* or a URL of an external script or style
* @param {string} [type='text/javascript'] MIME type to use if calling with a URL of an
// "https://example.org/x.js", "http://example.org/x.js", "//example.org/x.js", "/x.js"
if ( /^(https?:)?\/?\//.test( modules ) ) {
if ( type === 'text/css' ) {
- // Support: IE 7-8
- // Use properties instead of attributes as IE throws security
- // warnings when inserting a <link> tag with a protocol-relative
- // URL set though attributes - when on HTTPS. See T43331.
l = document.createElement( 'link' );
l.rel = 'stylesheet';
l.href = modules;
modules = [ modules ];
}
- // Filter out undefined modules, otherwise resolve() will throw
- // an exception for trying to load an undefined module.
- // Undefined modules are acceptable here in load(), because load() takes
- // an array of unrelated modules, whereas the modules passed to
- // using() are related and must all be loaded.
+ // Filter out top-level modules that are unknown or failed to load before.
filtered = $.grep( modules, function ( module ) {
var state = mw.loader.getState( module );
return state !== null && state !== 'error' && state !== 'missing';
} );
-
- if ( filtered.length === 0 ) {
- return;
- }
- // Resolve entire dependency map
- filtered = resolve( filtered );
+ // Resolve remaining list using the known dependency tree.
+ // This also filters out modules with unknown dependencies. (T36853)
+ filtered = resolveStubbornly( filtered );
// If all modules are ready, or if any modules have errors, nothing to be done.
if ( allReady( filtered ) || anyFailed( filtered ) ) {
return;
}
+ if ( filtered.length === 0 ) {
+ return;
+ }
// Some modules are not yet ready, add to module load queue.
enqueue( filtered, undefined, undefined );
},
* @return {Array}
*/
getModuleNames: function () {
- return $.map( registry, function ( i, key ) {
- return key;
- } );
+ return Object.keys( registry );
},
/**
* @member mw.hook
*/
$( function () {
- var loading = $.grep( mw.loader.getModuleNames(), function ( module ) {
+ var loading, modules;
+
+ modules = $.grep( mw.loader.getModuleNames(), function ( module ) {
return mw.loader.getState( module ) === 'loading';
} );
// We only need a callback, not any actual module. First try a single using()
// for all loading modules. If one fails, fall back to tracking each module
// separately via $.when(), this is expensive.
- loading = mw.loader.using( loading ).then( null, function () {
- var all = $.map( loading, function ( module ) {
+ loading = mw.loader.using( modules ).then( null, function () {
+ var all = modules.map( function ( module ) {
return mw.loader.using( module ).then( null, function () {
return $.Deferred().resolve();
} );
dépôts / lhc / web / wiklou.git / blobdiff