* ProfilerOutputUdp was removed. Note that there is a ProfilerOutputStats class.
* WikiPage::doDeleteArticleReal() and WikiPage::doDeleteArticle() now
ignore the 2nd and 3rd arguments (formerly $id and $commit).
+* Removed "loaderScripts" option from ResourceLoaderFileModule class.
== Compatibility ==
*/
protected $debugScripts = array();
- /**
- * @var array List of paths to JavaScript files to include in the startup module
- * @par Usage:
- * @code
- * array( [file-path], [file-path], ... )
- * @endcode
- */
- protected $loaderScripts = array();
-
/**
* @var array List of paths to CSS files to always include
* @par Usage:
* ),
* // Scripts to include in debug contexts
* 'debugScripts' => [file path string or array of file path strings],
- * // Scripts to include in the startup module
- * 'loaderScripts' => [file path string or array of file path strings],
* // Modules which must be loaded before this module
* 'dependencies' => [module name string or array of module name strings],
* 'templates' => array(
// Lists of file paths
case 'scripts':
case 'debugScripts':
- case 'loaderScripts':
case 'styles':
$this->{$member} = (array)$option;
break;
return $this->debugRaw;
}
- /**
- * Get loader script.
- *
- * @return string|bool JavaScript code to be added to startup module
- */
- public function getLoaderScript() {
- if ( count( $this->loaderScripts ) === 0 ) {
- return false;
- }
- return $this->readScriptFiles( $this->loaderScripts );
- }
-
/**
* Get all styles for a given context.
*
$this->templates,
$context->getDebug() ? $this->debugScripts : array(),
$this->getLanguageScripts( $context->getLanguage() ),
- self::tryForKey( $this->skinScripts, $context->getSkin(), 'default' ),
- $this->loaderScripts
+ self::tryForKey( $this->skinScripts, $context->getSkin(), 'default' )
);
if ( $this->skipFunction ) {
$files[] = $this->skipFunction;
// - position (only used by OutputPage)
'scripts',
'debugScripts',
- 'loaderScripts',
'styles',
'languageScripts',
'skinScripts',
return false;
}
- /**
- * Get the loader JS for this module, if set.
- *
- * @return mixed JavaScript loader code as a string or boolean false if no custom loader set
- */
- public function getLoaderScript() {
- // Stub, override expected
- return false;
- }
-
/**
* Get a list of modules this module depends on.
*
* Dependency information is taken into account when loading a module
* on the client side.
*
- * To add dependencies dynamically on the client side, use a custom
- * loader script, see getLoaderScript()
- *
* Note: It is expected that $context will be made non-optional in the near
* future.
*
* - array 'dependencies'
* - string|null 'group'
* - string 'source'
- * - string|false 'loader'
*/
public static function compileUnresolvedDependencies( array &$registryData ) {
foreach ( $registryData as $name => &$data ) {
- if ( $data['loader'] !== false ) {
- continue;
- }
$dependencies = $data['dependencies'];
foreach ( $data['dependencies'] as $dependency ) {
$implicitDependencies = self::getImplicitDependencies( $registryData, $dependency );
'dependencies' => $module->getDependencies( $context ),
'group' => $module->getGroup(),
'source' => $module->getSource(),
- 'loader' => $module->getLoaderScript(),
'skip' => $skipFunction,
);
}
// Register sources
$out .= ResourceLoader::makeLoaderSourcesScript( $resourceLoader->getSources() );
- // Concatenate module loader scripts and figure out the different call
- // signatures for mw.loader.register
+ // Figure out the different call signatures for mw.loader.register
$registrations = array();
foreach ( $registryData as $name => $data ) {
- if ( $data['loader'] !== false ) {
- $out .= ResourceLoader::makeCustomLoaderScript(
- $name,
- $data['version'],
- $data['dependencies'],
- $data['group'],
- $data['source'],
- $data['loader']
- );
- continue;
- }
-
// Call mw.loader.register(name, version, dependencies, group, source, skip)
$registrations[] = array(
$name,
'lists' => array(
'scripts',
'debugScripts',
- 'loaderScripts',
'styles',
),