Merge "resourceloader: Implement '$pages' parameter to ResourceLoaderWikiModule const...

diff --combined autoload.php
index 445d752,bf0ba98..dbc47ab
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -568,7 -568,7 +568,7 @@@ $wgAutoloadLocalClasses = array
        'Job' => __DIR__ . '/includes/jobqueue/Job.php',
        'JobQueue' => __DIR__ . '/includes/jobqueue/JobQueue.php',
        'JobQueueAggregator' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregator.php',
 -      'JobQueueAggregatorMemc' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorMemc.php',
 +      'JobQueueAggregatorNull' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregator.php',
        'JobQueueAggregatorRedis' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php',
        'JobQueueConnectionError' => __DIR__ . '/includes/jobqueue/JobQueue.php',
        'JobQueueDB' => __DIR__ . '/includes/jobqueue/JobQueueDB.php',
@@@ -977,14 -977,12 +977,12 @@@
        'ResourceLoaderContext' => __DIR__ . '/includes/resourceloader/ResourceLoaderContext.php',
        'ResourceLoaderEditToolbarModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderEditToolbarModule.php',
        'ResourceLoaderFileModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderFileModule.php',
-       'ResourceLoaderFilePageModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderFilePageModule.php',
        'ResourceLoaderFilePath' => __DIR__ . '/includes/resourceloader/ResourceLoaderFilePath.php',
        'ResourceLoaderImage' => __DIR__ . '/includes/resourceloader/ResourceLoaderImage.php',
        'ResourceLoaderImageModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderImageModule.php',
        'ResourceLoaderLanguageDataModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderLanguageDataModule.php',
        'ResourceLoaderLanguageNamesModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderLanguageNamesModule.php',
        'ResourceLoaderModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderModule.php',
-       'ResourceLoaderNoscriptModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderNoscriptModule.php',
        'ResourceLoaderSiteModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSiteModule.php',
        'ResourceLoaderSkinModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderSkinModule.php',
        'ResourceLoaderStartUpModule' => __DIR__ . '/includes/resourceloader/ResourceLoaderStartUpModule.php',

diff --combined resources/Resources.php
index 58a93a7,0874e68..4d000b6
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -29,12 -29,19 +29,19 @@@ return array
        /**
         * Special modules who have their own classes
         */
+       'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
  
        // Scripts managed by the local wiki (stored in the MediaWiki namespace)
        'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
-       'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
-       'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
-       'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
+       'noscript' => array(
+               'class' => 'ResourceLoaderWikiModule',
+               'styles' => array( 'MediaWiki:Noscript.css' ),
+               'group' => 'noscript',
+       ),
+       'filepage' => array(
+               'class' => 'ResourceLoaderWikiModule',
+               'styles' => array( 'MediaWiki:Filepage.css' ),
+       ),
        'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
  
        // Scripts managed by the current user (stored in their user space)
@@@ -776,7 -783,9 +783,7 @@@
        'mediawiki.apihelp' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.apihelp.css',
                'targets' => array( 'desktop' ),
 -              'dependencies' => array(
 -                      'mediawiki.hlist',
 -              ),
 +              'dependencies' => 'mediawiki.hlist',
                'position' => 'top',
        ),
        'mediawiki.template' => array(
@@@ -810,7 -819,9 +817,7 @@@
        ),
        'mediawiki.api.login' => array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.login.js',
 -              'dependencies' => array(
 -                      'mediawiki.api',
 -              ),
 +              'dependencies' => 'mediawiki.api',
        ),
        'mediawiki.api.parse' => array(
                'scripts' => 'resources/src/mediawiki.api/mediawiki.api.parse.js',
@@@ -852,48 -863,47 +859,48 @@@
                'position' => 'bottom',
        ),
        'mediawiki.feedback' => array(
 -              'templates' => array(
 -                      'dialog.html' => 'resources/src/mediawiki/templates/dialog.html',
 -              ),
                'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js',
                'styles' => 'resources/src/mediawiki/mediawiki.feedback.css',
                'dependencies' => array(
                        'mediawiki.api.edit',
                        'mediawiki.Title',
 -                      'mediawiki.jqueryMsg',
 -                      'jquery.ui.dialog',
 +                      'oojs-ui',
                ),
                'messages' => array(
 +                      'feedback-adding',
 +                      'feedback-back',
 +                      'feedback-bugcheck',
 +                      'feedback-dialog-intro',
 +                      'feedback-external-bug-report-button',
 +                      'feedback-bugnew',
                        'feedback-bugornote',
 -                      'feedback-subject',
 -                      'feedback-message',
                        'feedback-cancel',
 -                      'feedback-submit',
 -                      'feedback-adding',
 +                      'feedback-close',
 +                      'feedback-dialog-title',
 +                      'feedback-error-title',
                        'feedback-error1',
                        'feedback-error2',
                        'feedback-error3',
 +                      'feedback-message',
 +                      'feedback-subject',
 +                      'feedback-submit',
 +                      'feedback-terms',
 +                      'feedback-termsofuse',
                        'feedback-thanks',
 -                      'feedback-close',
 -                      'feedback-bugcheck',
 -                      'feedback-bugnew',
 +                      'feedback-thanks-title',
 +                      'feedback-useragent'
                ),
        ),
        'mediawiki.hidpi' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
 -              'dependencies' => array(
 -                      'jquery.hidpi',
 -              ),
 +              'dependencies' => 'jquery.hidpi',
                'skipFunction' => 'resources/src/mediawiki.hidpi-skip.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.hlist' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.hlist.css',
                'scripts' => 'resources/src/mediawiki/mediawiki.hlist.js',
 -              'dependencies' => array(
 -                      'jquery.client',
 -              ),
 +              'dependencies' => 'jquery.client',
        ),
        'mediawiki.htmlform' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
@@@ -925,7 -935,9 +932,7 @@@
                                => array( 'media' => 'print' ),
                ),
                'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
 -              'dependencies' => array(
 -                      'mediawiki.page.startup',
 -              ),
 +              'dependencies' => 'mediawiki.page.startup',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.notify' => array(
@@@ -972,7 -984,9 +979,7 @@@
        ),
        'mediawiki.toc' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
 -              'dependencies' => array(
 -                      'jquery.cookie',
 -              ),
 +              'dependencies' => 'jquery.cookie',
                'messages' => array( 'showtoc', 'hidetoc' ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -1010,7 -1024,9 +1017,7 @@@
        ),
        'mediawiki.cookie' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
 -              'dependencies' => array(
 -                      'jquery.cookie',
 -              ),
 +              'dependencies' => 'jquery.cookie',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.toolbar' => array(
@@@ -1123,7 -1139,9 +1130,7 @@@
        ),
        'mediawiki.action.view.redirect' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.redirect.js',
 -              'dependencies' => array(
 -                      'jquery.client',
 -              ),
 +              'dependencies' => 'jquery.client',
                'position' => 'top',
        ),
        'mediawiki.action.view.redirectPage' => array(
@@@ -1248,7 -1266,9 +1255,7 @@@
        ),
        'mediawiki.page.startup' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.startup.js',
 -              'dependencies' => array(
 -                      'mediawiki.util',
 -              ),
 +              'dependencies' => 'mediawiki.util',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -1307,12 -1327,16 +1314,12 @@@
        'mediawiki.special.block' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.block.css',
 -              'dependencies' => array(
 -                      'mediawiki.util',
 -              ),
 +              'dependencies' => 'mediawiki.util',
        ),
        'mediawiki.special.changeemail' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeemail.js',
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeemail.css',
 -              'dependencies' => array(
 -                      'mediawiki.util',
 -              ),
 +              'dependencies' => 'mediawiki.util',
                'messages' => array(
                        'email-address-validity-valid',
                        'email-address-validity-invalid',
@@@ -1363,7 -1387,7 +1370,7 @@@
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
 -              'dependencies' => array( 'mediawiki.special' ),
 +              'dependencies' => 'mediawiki.special',
                'position' => 'top',
        ),
        'mediawiki.special.search' => array(
@@@ -1471,7 -1495,9 +1478,7 @@@
                        'colon-separator',
                        'javascripttest-pagetext-skins',
                ) ),
 -              'dependencies' => array(
 -                      'mediawiki.Uri',
 -              ),
 +              'dependencies' => 'mediawiki.Uri',
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -1505,7 -1531,9 +1512,7 @@@
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',
 -              'dependencies' => array(
 -                      'jquery.byteLimit',
 -              ),
 +              'dependencies' => 'jquery.byteLimit',
                'messages' => array( 'protect-unchain-permissions' )
        ),
        'mediawiki.legacy.shared' => array(
@@@ -1521,7 -1549,9 +1528,7 @@@
        ),
        'mediawiki.legacy.wikibits' => array(
                'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
 -              'dependencies' => array(
 -                      'mediawiki.util',
 -              ),
 +              'dependencies' => 'mediawiki.util',
                'position' => 'top',
        ),