Merge "Preload styles for 'jquery.tablesorter'"

diff --combined includes/specials/SpecialTrackingCategories.php
index 4a586b7,4f65437..1afbb5e
--- 1/includes/specials/SpecialTrackingCategories.php
--- 2/includes/specials/SpecialTrackingCategories.php
+++ b/includes/specials/SpecialTrackingCategories.php
@@@ -40,6 -40,8 +40,8 @@@ class SpecialTrackingCategories extend
                $this->setHeaders();
                $this->outputHeader();
                $this->getOutput()->allowClickjacking();
+               $this->getOutput()->addModuleStyles( 'jquery.tablesorter.styles' );
+               $this->getOutput()->addModules( 'jquery.tablesorter' );
                $this->getOutput()->addHTML(
                        Html::openElement( 'table', [ 'class' => 'mw-datatable sortable',
                                'id' => 'mw-trackingcategories-table' ] ) . "\n" .
@@@ -94,7 -96,7 +96,7 @@@
                        }
  
                        # Extra message, when no category was found
 -                      if ( !count( $allMsgs ) ) {
 +                      if ( $allMsgs === [] ) {
                                $allMsgs[] = $this->msg( 'trackingcategories-disabled' )->parse();
                        }
  

diff --combined resources/Resources.php
index 9464cf7,52822e4..83f11f8
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -183,6 -183,11 +183,6 @@@ return 
                'dependencies' => 'mediawiki.String',
                'targets' => [ 'desktop', 'mobile' ],
        ],
 -      'jquery.byteLimit' => [
 -              'dependencies' => 'jquery.lengthLimit',
 -              'deprecated' => 'Use "jquery.lengthLimit" instead.',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
        'jquery.checkboxShiftClick' => [
                'scripts' => 'resources/src/jquery/jquery.checkboxShiftClick.js',
                'targets' => [ 'desktop', 'mobile' ],
@@@ -320,13 -325,17 +320,17 @@@
        'jquery.tablesorter' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => 'resources/src/jquery.tablesorter/jquery.tablesorter.js',
-               'styles' => 'resources/src/jquery.tablesorter/jquery.tablesorter.less',
                'messages' => [ 'sort-descending', 'sort-ascending' ],
                'dependencies' => [
+                       'jquery.tablesorter.styles',
                        'mediawiki.RegExp',
                        'mediawiki.language.months',
                ],
        ],
+       'jquery.tablesorter.styles' => [
+               'targets' => [ 'desktop', 'mobile' ],
+               'styles' => 'resources/src/jquery.tablesorter.styles/jquery.tablesorter.styles.less',
+       ],
        'jquery.textSelection' => [
                'scripts' => 'resources/src/jquery/jquery.textSelection.js',
                'dependencies' => 'jquery.client',
@@@ -883,6 -892,54 +887,6 @@@
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 -      'mediawiki.api.category' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -      ],
 -      'mediawiki.api.edit' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => [
 -                      'mediawiki.api',
 -              ],
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.api.login' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -      ],
 -      'mediawiki.api.options' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.api.parse' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.api.upload' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.api.user' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.api.watch' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -      ],
 -      'mediawiki.api.messages' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -              'targets' => [ 'desktop', 'mobile' ],
 -      ],
 -      'mediawiki.api.rollback' => [
 -              'deprecated' => 'Use "mediawiki.api" instead.',
 -              'dependencies' => 'mediawiki.api',
 -      ],
        'mediawiki.content.json' => [
                'styles' => 'resources/src/mediawiki.content.json.less',
        ],
@@@ -1924,7 -1981,7 +1928,7 @@@
        ],
        'mediawiki.special' => [
                'styles' => [
 -                      'resources/src/mediawiki.special/special.css',
 +                      'resources/src/mediawiki.special/special.less',
                        'resources/src/mediawiki.special/apisandbox.css',
                        'resources/src/mediawiki.special/comparepages.less',
                        'resources/src/mediawiki.special/edittags.css',
@@@ -1934,7 -1991,6 +1938,7 @@@
                        'resources/src/mediawiki.special/upload.css',
                        'resources/src/mediawiki.special/userrights.css',
                        'resources/src/mediawiki.special/watchlist.css',
 +                      'resources/src/mediawiki.special/block.less',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@@ -2013,13 -2069,13 +2017,13 @@@
        ],
        'mediawiki.special.block' => [
                'scripts' => 'resources/src/mediawiki.special.block.js',
 -              'styles' => 'resources/src/mediawiki.special.block.less',
                'dependencies' => [
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-editing-core',
                        'oojs-ui.styles.icons-editing-advanced',
                        'mediawiki.widgets.DateInputWidget',
                        'mediawiki.widgets.SelectWithInputWidget',
 +                      'mediawiki.widgets.NamespacesMultiselectWidget',
                        'mediawiki.widgets.TitlesMultiselectWidget',
                        'mediawiki.widgets.UserInputWidget',
                        'mediawiki.util',
@@@ -2115,7 -2171,6 +2119,7 @@@
                        'mediawiki.language',
                        'mediawiki.confirmCloseWindow',
                        'mediawiki.notification.convertmessagebox',
 +                      'mediawiki.storage',
                        'oojs-ui-widgets',
                        'mediawiki.widgets.SelectWithInputWidget',
                        'mediawiki.editfont.styles',
@@@ -2672,15 -2727,6 +2676,15 @@@
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 +      'mediawiki.widgets.NamespacesMultiselectWidget' => [
 +              'scripts' => [
 +                      'resources/src/mediawiki.widgets/mw.widgets.NamespacesMultiselectWidget.js',
 +              ],
 +              'dependencies' => [
 +                      'oojs-ui-widgets',
 +              ],
 +              'targets' => [ 'desktop', 'mobile' ],
 +      ],
        'mediawiki.widgets.TitlesMultiselectWidget' => [
                'scripts' => [
                        'resources/src/mediawiki.widgets/mw.widgets.TitlesMultiselectWidget.js',
@@@ -2825,8 -2871,7 +2829,8 @@@
                        'oojs-ui.styles.icons-interactions',
                ],
                'messages' => [
 -                      'ooui-field-help'
 +                      'ooui-field-help',
 +                      'ooui-combobox-button-label',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],