Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345682 )
Change subject: [WIP] Deprecate global alias window.mw
......................................................................
[WIP] Deprecate global alias window.mw
Use global variable window.mediaWiki instead.
You can create a local alias mw of mediaWiki inside of a closure:
( function ( mw ) {
mw.foo();
}( mediaWiki ) );
Change-Id: I2694d8289d8e154b3aef7b54a23a8a6f114074e3
---
M includes/EditPage.php
M includes/content/JavaScriptContentHandler.php
M includes/resourceloader/ResourceLoader.php
M includes/resourceloader/ResourceLoaderClientHtml.php
M includes/resourceloader/ResourceLoaderJqueryMsgModule.php
M includes/resourceloader/ResourceLoaderLanguageDataModule.php
M includes/resourceloader/ResourceLoaderLanguageNamesModule.php
M includes/resourceloader/ResourceLoaderModule.php
M includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
M includes/resourceloader/ResourceLoaderUserDefaultsModule.php
M includes/resourceloader/ResourceLoaderUserOptionsModule.php
M includes/resourceloader/ResourceLoaderUserTokensModule.php
M includes/specials/SpecialJavaScriptTest.php
M resources/src/mediawiki/mediawiki.js
M resources/src/startup.js
M tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
M tests/qunit/data/load.mock.php
19 files changed, 60 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/345682/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7d19e94..5e1c7ef 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3968,7 +3968,7 @@
]
];
- $script = 'mw.loader.using("mediawiki.toolbar", function () {';
+ $script = 'mediaWiki.loader.using("mediawiki.toolbar", function
() {';
foreach ( $toolarray as $tool ) {
if ( !$tool ) {
continue;
@@ -3989,7 +3989,7 @@
];
$script .= Xml::encodeJsCall(
- 'mw.toolbar.addButton',
+ 'mediaWiki.toolbar.addButton',
$params,
ResourceLoader::inDebugMode()
);
diff --git a/includes/content/JavaScriptContentHandler.php
b/includes/content/JavaScriptContentHandler.php
index 9abad3e..dad3cc8 100644
--- a/includes/content/JavaScriptContentHandler.php
+++ b/includes/content/JavaScriptContentHandler.php
@@ -57,6 +57,6 @@
// The parameters are passed as a string so the / is not
url-encoded by wfArrayToCgi
$url = $destination->getFullURL(
'action=raw&ctype=text/javascript', false, PROTO_RELATIVE );
$class = $this->getContentClass();
- return new $class( '/* #REDIRECT */' . Xml::encodeJsCall(
'mw.loader.load', [ $url ] ) );
+ return new $class( '/* #REDIRECT */' . Xml::encodeJsCall(
'mediaWiki.loader.load', [ $url ] ) );
}
}
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index e72eaf2..610bb95 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1183,7 +1183,7 @@
];
self::trimArray( $module );
- return Xml::encodeJsCall( 'mw.loader.implement', $module,
ResourceLoader::inDebugMode() );
+ return Xml::encodeJsCall( 'mediaWiki.loader.implement',
$module, ResourceLoader::inDebugMode() );
}
/**
@@ -1195,7 +1195,7 @@
*/
public static function makeMessageSetScript( $messages ) {
return Xml::encodeJsCall(
- 'mw.messages.set',
+ 'mediaWiki.messages.set',
[ (object)$messages ],
ResourceLoader::inDebugMode()
);
@@ -1252,13 +1252,13 @@
public static function makeLoaderStateScript( $name, $state = null ) {
if ( is_array( $name ) ) {
return Xml::encodeJsCall(
- 'mw.loader.state',
+ 'mediaWiki.loader.state',
[ $name ],
ResourceLoader::inDebugMode()
);
} else {
return Xml::encodeJsCall(
- 'mw.loader.state',
+ 'mediaWiki.loader.state',
[ $name, $state ],
ResourceLoader::inDebugMode()
);
@@ -1376,7 +1376,7 @@
array_walk( $name, [ 'self', 'trimArray' ] );
return Xml::encodeJsCall(
- 'mw.loader.register',
+ 'mediaWiki.loader.register',
[ $name ],
ResourceLoader::inDebugMode()
);
@@ -1384,7 +1384,7 @@
$registration = [ $name, $version, $dependencies,
$group, $source, $skip ];
self::trimArray( $registration );
return Xml::encodeJsCall(
- 'mw.loader.register',
+ 'mediaWiki.loader.register',
$registration,
ResourceLoader::inDebugMode()
);
@@ -1408,13 +1408,13 @@
public static function makeLoaderSourcesScript( $id, $loadUrl = null ) {
if ( is_array( $id ) ) {
return Xml::encodeJsCall(
- 'mw.loader.addSource',
+ 'mediaWiki.loader.addSource',
[ $id ],
ResourceLoader::inDebugMode()
);
} else {
return Xml::encodeJsCall(
- 'mw.loader.addSource',
+ 'mediaWiki.loader.addSource',
[ $id, $loadUrl ],
ResourceLoader::inDebugMode()
);
@@ -1461,7 +1461,7 @@
*/
public static function makeConfigSetScript( array $configuration ) {
return Xml::encodeJsCall(
- 'mw.config.set',
+ 'mediaWiki.config.set',
[ $configuration ],
ResourceLoader::inDebugMode()
);
diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php
b/includes/resourceloader/ResourceLoaderClientHtml.php
index 8c792ad..95d5f6f 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -279,7 +279,7 @@
// Inline RLQ: Load general modules
if ( $data['general'] ) {
$chunks[] = ResourceLoader::makeInlineScript(
- Xml::encodeJsCall( 'mw.loader.load', [
$data['general'] ] )
+ Xml::encodeJsCall( 'mediaWiki.loader.load', [
$data['general'] ] )
);
}
@@ -438,7 +438,7 @@
] );
} else {
$chunk =
ResourceLoader::makeInlineScript(
- Xml::encodeJsCall(
'mw.loader.load', [ $url ] )
+ Xml::encodeJsCall(
'mediaWiki.loader.load', [ $url ] )
);
}
}
diff --git a/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
b/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
index 1704481..3fa60fc 100644
--- a/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
+++ b/includes/resourceloader/ResourceLoaderJqueryMsgModule.php
@@ -43,7 +43,7 @@
)
);
- $mainDataScript = Xml::encodeJsCall(
'mw.jqueryMsg.setParserDefaults', [ $parserDefaults ] );
+ $mainDataScript = Xml::encodeJsCall(
'mediaWiki.jqueryMsg.setParserDefaults', [ $parserDefaults ] );
// Associative array mapping magic words (e.g. SITENAME)
// to their values.
@@ -57,7 +57,7 @@
'magic' => $magicWords,
];
- $magicWordDataScript = Xml::encodeJsCall(
'mw.jqueryMsg.setParserDefaults', [
+ $magicWordDataScript = Xml::encodeJsCall(
'mediaWiki.jqueryMsg.setParserDefaults', [
$magicWordExtendData,
/* deep= */ true
] );
diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index ef942fa..ad0265d 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -54,7 +54,7 @@
*/
public function getScript( ResourceLoaderContext $context ) {
return Xml::encodeJsCall(
- 'mw.language.setData',
+ 'mediaWiki.language.setData',
[
$context->getLanguage(),
$this->getData( $context )
diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 57260ba..8cc7eb2 100644
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -49,7 +49,7 @@
*/
public function getScript( ResourceLoaderContext $context ) {
return Xml::encodeJsCall(
- 'mw.language.setData',
+ 'mediaWiki.language.setData',
[
$context->getLanguage(),
'languageNames',
diff --git a/includes/resourceloader/ResourceLoaderModule.php
b/includes/resourceloader/ResourceLoaderModule.php
index 5404e0f..e18f890 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -151,7 +151,7 @@
$warning .= "\n" . $deprecationInfo;
}
return Xml::encodeJsCall(
- 'mw.log.warn',
+ 'mediaWiki.log.warn',
[ $warning ]
);
} else {
@@ -952,7 +952,7 @@
} catch ( Exception $e ) {
// We'll save this to cache to avoid having to
validate broken JS over and over...
$err = $e->getMessage();
- $result = "mw.log.error(" .
+ $result = "mediaWiki.log.error(" .
Xml::encodeJsVar( "JavaScript parse
error: $err" ) . ");";
}
diff --git
a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
index 44371bb..40c2a71 100644
--- a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
+++ b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
@@ -45,7 +45,7 @@
*/
public function getScript( ResourceLoaderContext $context ) {
return Xml::encodeJsCall(
- 'mw.language.setSpecialCharacters',
+ 'mediaWiki.language.setSpecialCharacters',
[
$this->getData()
],
diff --git a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index 6632045..2247ffe 100644
--- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@ -41,7 +41,7 @@
*/
public function getScript( ResourceLoaderContext $context ) {
return Xml::encodeJsCall(
- 'mw.user.options.set',
+ 'mediaWiki.user.options.set',
[ User::getDefaultOptions() ],
ResourceLoader::inDebugMode()
);
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index b3b3f16..7f913f4 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -51,7 +51,7 @@
* @return string
*/
public function getScript( ResourceLoaderContext $context ) {
- return Xml::encodeJsCall( 'mw.user.options.set',
+ return Xml::encodeJsCall( 'mediaWiki.user.options.set',
[ $context->getUserObj()->getOptions(
User::GETOPTIONS_EXCLUDE_DEFAULTS ) ],
ResourceLoader::inDebugMode()
);
diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php
b/includes/resourceloader/ResourceLoaderUserTokensModule.php
index cea1f39..dee2b2f 100644
--- a/includes/resourceloader/ResourceLoaderUserTokensModule.php
+++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php
@@ -61,7 +61,7 @@
*/
public function getScript( ResourceLoaderContext $context ) {
return Xml::encodeJsCall(
- 'mw.user.tokens.set',
+ 'mediaWiki.user.tokens.set',
[ $this->contextUserTokens( $context ) ],
ResourceLoader::inDebugMode()
) . ResourceLoader::FILTER_NOMIN;
diff --git a/includes/specials/SpecialJavaScriptTest.php
b/includes/specials/SpecialJavaScriptTest.php
index dc6a619..7a4dce3 100644
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -134,14 +134,14 @@
// Catch exceptions (such as "dependency missing" or "unknown
module") so that we
// always start QUnit. Re-throw so that they are caught and
reported as global exceptions
// by QUnit and Karma.
- $code .= '(function () {'
+ $code .= '(function ( mw ) {'
. 'var start = window.__karma__ ?
window.__karma__.start : QUnit.start;'
. 'try {'
. 'mw.loader.using( ' . Xml::encodeJsVar( $modules ) .
' )'
. '.always( start )'
. '.fail( function ( e ) { throw e; } );'
. '} catch ( e ) { start(); throw e; }'
- . '}());';
+ . '}( mediaWiki ));';
header( 'Content-Type: text/javascript; charset=utf-8' );
header( 'Cache-Control: private, no-cache, must-revalidate' );
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index c2cee7e..3c2f33e 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2376,7 +2376,7 @@
return false;
}
- src = 'mw.loader.implement(' +
args.join( ',' ) + ');';
+ src =
'mediaWiki.loader.implement(' + args.join( ',' ) + ');';
if ( src.length >
mw.loader.store.MODULE_SIZE_MAX ) {
return false;
}
@@ -2792,6 +2792,9 @@
} );
} );
- // Attach to window and globally alias
- window.mw = window.mediaWiki = mw;
+ // Attach to window
+ window.mediaWiki = mw;
+
+ // Deprecated global alias
+ mw.log.deprecate( window, 'mw', mw, 'Use mediaWiki instead.' );
}( jQuery ) );
diff --git a/resources/src/startup.js b/resources/src/startup.js
index deb280a..dab0953 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -4,7 +4,7 @@
* This file is where we decide whether to initialise the modern run-time.
*/
-/* global mw, $VARS, $CODE */
+/* global mediaWiki, $VARS, $CODE */
var mwPerformance = ( window.performance && performance.mark ) ? performance :
{
mark: function () {}
@@ -121,6 +121,7 @@
* The $CODE and $VARS placeholders are substituted in
ResourceLoaderStartUpModule.php.
*/
function startUp() {
+ var mw = mediaWiki;
mw.config = new mw.Map( $VARS.wgLegacyJavaScriptGlobals );
$CODE.registrations();
diff --git
a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
index 2db3c16..a53143f 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
@@ -169,11 +169,11 @@
// @codingStandardsIgnoreStart Generic.Files.LineLength
$expected = '<script>document.documentElement.className =
document.documentElement.className.replace( /(^|\s)client-nojs(\s|$)/,
"$1client-js$2" );</script>' . "\n"
. '<script>(window.RLQ=window.RLQ||[]).push(function(){'
- . 'mw.config.set({"key":"value"});'
- .
'mw.loader.state({"test.exempt":"ready","test.private.top":"loading","test.styles.pure":"ready","test.styles.private":"ready","test.scripts.top":"loading"});'
- .
'mw.loader.implement("test.private.top@{blankVer}",function($,jQuery,require,module){},{"css":[]});'
- . 'mw.loader.load(["test.top"]);'
- .
'mw.loader.load("/w/load.php?debug=false\u0026lang=nl\u0026modules=test.scripts.top\u0026only=scripts\u0026skin=fallback");'
+ . 'mediaWiki.config.set({"key":"value"});'
+ .
'mediaWiki.loader.state({"test.exempt":"ready","test.private.top":"loading","test.styles.pure":"ready","test.styles.private":"ready","test.scripts.top":"loading"});'
+ .
'mediaWiki.loader.implement("test.private.top@{blankVer}",function($,jQuery,require,module){},{"css":[]});'
+ . 'mediaWiki.loader.load(["test.top"]);'
+ .
'mediaWiki.loader.load("/w/load.php?debug=false\u0026lang=nl\u0026modules=test.scripts.top\u0026only=scripts\u0026skin=fallback");'
. '});</script>' . "\n"
. '<link rel="stylesheet"
href="/w/load.php?debug=false&lang=nl&modules=test.styles.pure&only=styles&skin=fallback"/>'
. "\n"
. '<style>.private{}</style>' . "\n"
@@ -227,7 +227,7 @@
'context' => [],
'modules' => [ 'test.private.top' ],
'only' => ResourceLoaderModule::TYPE_COMBINED,
- 'output' =>
'<script>(window.RLQ=window.RLQ||[]).push(function(){mw.loader.implement("test.private.top@{blankVer}",function($,jQuery,require,module){},{"css":[]});});</script>',
+ 'output' =>
'<script>(window.RLQ=window.RLQ||[]).push(function(){mediaWiki.loader.implement("test.private.top@{blankVer}",function($,jQuery,require,module){},{"css":[]});});</script>',
],
[
'context' => [],
@@ -240,7 +240,7 @@
'context' => [],
'modules' => [ 'test.scripts.mixed.user' ],
'only' => ResourceLoaderModule::TYPE_SCRIPTS,
- 'output' =>
'<script>(window.RLQ=window.RLQ||[]).push(function(){mw.loader.load("/w/load.php?debug=false\u0026lang=nl\u0026modules=test.scripts.mixed.user\u0026only=scripts\u0026skin=fallback\u0026user=Example\u0026version=0a56zyi");});</script>',
+ 'output' =>
'<script>(window.RLQ=window.RLQ||[]).push(function(){mediaWiki.loader.load("/w/load.php?debug=false\u0026lang=nl\u0026modules=test.scripts.mixed.user\u0026only=scripts\u0026skin=fallback\u0026user=Example\u0026version=0a56zyi");});</script>',
],
[
'context' => [ 'debug' => true ],
diff --git
a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
index 7d12e59..b2d0bb3 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderFileModuleTest.php
@@ -108,11 +108,11 @@
return [
[
'deprecatedModule',
- 'mw.log.warn("This page is using the deprecated
ResourceLoader module \"deprecatedModule\".");',
+ 'mediaWiki.log.warn("This page is using the
deprecated ResourceLoader module \"deprecatedModule\".");',
],
[
'deprecatedTomorrow',
- 'mw.log.warn(' .
+ 'mediaWiki.log.warn(' .
'"This page is using the deprecated
ResourceLoader module \"deprecatedTomorrow\".\\n' .
"Will be removed tomorrow." .
'");'
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index e0a82d0..446a61a 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -269,7 +269,7 @@
'messages' => [ 'example' => '' ],
'templates' => [],
- 'expected' => 'mw.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
+ 'expected' => 'mediaWiki.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
mw.example();
}, {
"css": [
@@ -286,7 +286,7 @@
'scripts' => 'mw.example();',
'styles' => [],
- 'expected' => 'mw.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
+ 'expected' => 'mediaWiki.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
mw.example();
} );',
] ],
@@ -297,7 +297,7 @@
'scripts' => [],
'styles' => [ 'css' => [ '.mw-example {}' ] ],
- 'expected' => 'mw.loader.implement(
"test.example", [], {
+ 'expected' => 'mediaWiki.loader.implement(
"test.example", [], {
"css": [
".mw-example {}"
]
@@ -310,7 +310,7 @@
'scripts' => 'mw.example();',
'messages' => [ 'example' => '' ],
- 'expected' => 'mw.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
+ 'expected' => 'mediaWiki.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
mw.example();
}, {}, {
"example": ""
@@ -323,7 +323,7 @@
'scripts' => 'mw.example();',
'templates' => [ 'example.html' => '' ],
- 'expected' => 'mw.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
+ 'expected' => 'mediaWiki.loader.implement(
"test.example", function ( $, jQuery, require, module ) {
mw.example();
}, {}, {}, {
"example.html": ""
@@ -336,7 +336,7 @@
'scripts' => 'mw.example( 1 );',
'wrap' => false,
- 'expected' => 'mw.loader.implement( "user",
"mw.example( 1 );" );',
+ 'expected' => 'mediaWiki.loader.implement(
"user", "mw.example( 1 );" );',
] ],
];
}
@@ -389,17 +389,17 @@
*/
public function testMakeLoaderSourcesScript() {
$this->assertEquals(
- 'mw.loader.addSource( "local", "/w/load.php" );',
+ 'mediaWiki.loader.addSource( "local", "/w/load.php" );',
ResourceLoader::makeLoaderSourcesScript( 'local',
'/w/load.php' )
);
$this->assertEquals(
- 'mw.loader.addSource( {
+ 'mediaWiki.loader.addSource( {
"local": "/w/load.php"
} );',
ResourceLoader::makeLoaderSourcesScript( [ 'local' =>
'/w/load.php' ] )
);
$this->assertEquals(
- 'mw.loader.addSource( {
+ 'mediaWiki.loader.addSource( {
"local": "/w/load.php",
"example": "https://example.org/w/load.php";
} );',
@@ -409,7 +409,7 @@
] )
);
$this->assertEquals(
- 'mw.loader.addSource( [] );',
+ 'mediaWiki.loader.addSource( [] );',
ResourceLoader::makeLoaderSourcesScript( [] )
);
}
@@ -519,7 +519,7 @@
$this->assertCount( 1, $errors );
$this->assertRegExp( '/Ferry not found/', $errors[0] );
$this->assertEquals(
- 'foo();bar();mw.loader.state( {
+ 'foo();bar();mediaWiki.loader.state( {
"ferry": "error",
"foo": "ready",
"bar": "ready"
diff --git a/tests/qunit/data/load.mock.php b/tests/qunit/data/load.mock.php
index 71cf852..6ef4afb 100644
--- a/tests/qunit/data/load.mock.php
+++ b/tests/qunit/data/load.mock.php
@@ -29,31 +29,31 @@
$moduleImplementations = [
'testUsesMissing' => "
-mw.loader.implement( 'testUsesMissing', function () {
+mediaWiki.loader.implement( 'testUsesMissing', function () {
QUnit.ok( false, 'Module usesMissing script should not run.' );
QUnit.start();
}, {}, {});
",
'testUsesNestedMissing' => "
-mw.loader.implement( 'testUsesNestedMissing', function () {
+mediaWiki.loader.implement( 'testUsesNestedMissing', function () {
QUnit.ok( false, 'Module testUsesNestedMissing script should not run.'
);
QUnit.start();
}, {}, {});
",
'testSkipped' =>"
-mw.loader.implement( 'testSkipped', function () {
+mediaWiki.loader.implement( 'testSkipped', function () {
QUnit.ok( false, 'Module testSkipped was supposed to be skipped.' );
}, {}, {});
",
'testNotSkipped' =>"
-mw.loader.implement( 'testNotSkipped', function () {}, {}, {});
+mediaWiki.loader.implement( 'testNotSkipped', function () {}, {}, {});
",
'testUsesSkippable' =>"
-mw.loader.implement( 'testUsesSkippable', function () {}, {}, {});
+mediaWiki.loader.implement( 'testUsesSkippable', function () {}, {}, {});
",
];
@@ -66,7 +66,7 @@
if ( isset( $moduleImplementations[$module] ) ) {
$response .= $moduleImplementations[$module];
} else {
- $response .= Xml::encodeJsCall( 'mw.loader.state', [
$module, 'missing' ], true );
+ $response .= Xml::encodeJsCall(
'mediaWiki.loader.state', [ $module, 'missing' ], true );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/345682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2694d8289d8e154b3aef7b54a23a8a6f114074e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
