+/*jslint browser: true, continue: true, white: true, forin: true*/
+/*global jQuery*/
/*
* Core MediaWiki JavaScript Library
*/
var mw = ( function ( $, undefined ) {
-"use strict";
+ "use strict";
/* Private Members */
results[selection[i]] = this.get( selection[i], fallback );
}
return results;
- } else if ( typeof selection === 'string' ) {
+ }
+
+ if ( typeof selection === 'string' ) {
if ( this.values[selection] === undefined ) {
if ( fallback !== undefined ) {
return fallback;
}
return this.values[selection];
}
+
if ( selection === undefined ) {
return this.values;
- } else {
- return null; // invalid selection key
}
+
+ // invalid selection key
+ return null;
},
/**
this.values[s] = selection[s];
}
return true;
- } else if ( typeof selection === 'string' && value !== undefined ) {
+ }
+ if ( typeof selection === 'string' && value !== undefined ) {
this.values[selection] = value;
return true;
}
}
}
return true;
- } else {
- return this.values[selection] !== undefined;
}
+ return this.values[selection] !== undefined;
}
};
* each a parameter for $N replacement in messages.
* @return String.
*/
- msg: function ( key, parameters ) {
+ msg: function ( /* key, parameter_1, parameter_2, .. */ ) {
return mw.message.apply( mw.message, arguments ).toString();
},
// Cached ?
if ( $marker ) {
return $marker;
- } else {
- $marker = $( 'meta[name="ResourceLoaderDynamicStyles"]' );
- if ( $marker.length ) {
- return $marker;
- }
- mw.log( 'getMarker> No <meta name="ResourceLoaderDynamicStyles"> found, inserting dynamically.' );
- $marker = $( '<meta>' ).attr( 'name', 'ResourceLoaderDynamicStyles' ).appendTo( 'head' );
+ }
+
+ $marker = $( 'meta[name="ResourceLoaderDynamicStyles"]' );
+ if ( $marker.length ) {
return $marker;
}
+ mw.log( 'getMarker> No <meta name="ResourceLoaderDynamicStyles"> found, inserting dynamically.' );
+ $marker = $( '<meta>' ).attr( 'name', 'ResourceLoaderDynamicStyles' ).appendTo( 'head' );
+
+ return $marker;
}
/**
}
}
return modules;
- } else if ( typeof module === 'string' ) {
+ }
+
+ if ( typeof module === 'string' ) {
resolved = [];
recurse( module, resolved, [] );
return resolved;
}
+
throw new Error( 'Invalid module argument: ' + module );
}
}
}
}
+
// Add ready and error callbacks if they were given
- if ( arguments.length > 1 ) {
+ if ( ready !== undefined || error !== undefined ) {
jobs[jobs.length] = {
'dependencies': filter(
['registered', 'loading', 'loaded'],
'error': error
};
}
+
// Queue up any dependencies that are registered
dependencies = filter( ['registered'], dependencies );
for ( n = 0; n < dependencies.length; n += 1 ) {
}
}
}
+
// Work the queue
mw.loader.work();
}
href: modules
} ) );
return;
- } else if ( type === 'text/javascript' || type === undefined ) {
+ }
+ if ( type === 'text/javascript' || type === undefined ) {
addScript( modules, null, async );
return;
}
return;
}
// If any modules have errors
- else if ( filter( ['error'], filtered ).length ) {
+ if ( filter( ['error'], filtered ).length ) {
return;
}
// Since some modules are not yet ready, queue up a request
- else {
- request( filtered, null, null, async );
- return;
- }
+ request( filtered, null, null, async );
+ return;
},
/**
}
};
-})( jQuery );
+}( jQuery ) );
// Alias $j to jQuery for backwards compatibility
window.$j = jQuery;
window.mw = window.mediaWiki = mw;
// Auto-register from pre-loaded startup scripts
-if ( typeof startUp !== 'undefined' && jQuery.isFunction( startUp ) ) {
- startUp();
- startUp = undefined;
+if ( jQuery.isFunction( window.startUp ) ) {
+ window.startUp();
+ window.startUp = undefined;
}