From 02339039605990cc015edccdc261cd62a6d4eeca Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 26 May 2016 18:35:28 +0100 Subject: [PATCH] mediawiki.special.recentchanges: Use module.exports instead of mw.special This isn't generally used as a public method. The only reason it's exposed is for an integration test to access it. This commit and others prepare for removal of the 'mediawiki.special.js' file. This script does nothing other than create "mw.special = {};". While that init pattern is common in extensions and not wrong, 'mediawiki.special' violates T92459 due to having styles. Given there's only script uses of it, it's easiest to remove it in favour of the new module export pattern. Change-Id: I2e78828828601e1160550efe02c07172ac32e985 --- resources/Resources.php | 1 - .../src/mediawiki.special/mediawiki.special.recentchanges.js | 2 +- .../mediawiki.special.recentchanges.test.js | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index bacf1e6a9d..4d5173f1e4 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1880,7 +1880,6 @@ return [ ], 'mediawiki.special.recentchanges' => [ 'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js', - 'dependencies' => 'mediawiki.special', 'position' => 'top', ], 'mediawiki.special.search' => [ diff --git a/resources/src/mediawiki.special/mediawiki.special.recentchanges.js b/resources/src/mediawiki.special/mediawiki.special.recentchanges.js index d43b62b044..bdd45bc824 100644 --- a/resources/src/mediawiki.special/mediawiki.special.recentchanges.js +++ b/resources/src/mediawiki.special/mediawiki.special.recentchanges.js @@ -34,6 +34,6 @@ $( rc.init ); - mw.special.recentchanges = rc; + module.exports = rc; }( mediaWiki, jQuery ) ); diff --git a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js index ee854aef4e..edc2716e5b 100644 --- a/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js +++ b/tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js @@ -4,7 +4,8 @@ // TODO: verify checkboxes == [ 'nsassociated', 'nsinvert' ] QUnit.test( '"all" namespace disable checkboxes', 8, function ( assert ) { - var selectHtml, $env, $options; + var selectHtml, $env, $options, + rc = require( 'mediawiki.special.recentchanges' ); // from Special:Recentchanges selectHtml = '