Merge "mediawiki.notification: Move files to their own directory"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 May 2018 18:14:07 +0000 (18:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 May 2018 18:14:07 +0000 (18:14 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -112,6 -112,13 +112,6 @@@ return 
                        'resources/src/mediawiki.skinning/interface.css' => [ 'media' => 'screen' ],
                ],
        ],
 -
 -      'jquery.tablesorter.styles' => [
 -              'targets' => [ 'desktop', 'mobile' ],
 -              'styles' => [
 -                      'resources/src/jquery/jquery.tablesorter.styles.less',
 -              ],
 -      ],
        'jquery.makeCollapsible.styles' => [
                'targets' => [ 'desktop', 'mobile' ],
                'class' => ResourceLoaderLessVarFileModule::class,
                'scripts' => 'resources/src/jquery/jquery.tabIndex.js',
        ],
        'jquery.tablesorter' => [
 -              'scripts' => 'resources/src/jquery/jquery.tablesorter.js',
 -              'styles' => 'resources/src/jquery/jquery.tablesorter.less',
 +              '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.language.months',
                ],
        ],
 +      'jquery.tablesorter.styles' => [
 +              'targets' => [ 'desktop', 'mobile' ],
 +              'styles' => [
 +                      'resources/src/jquery/jquery.tablesorter.styles.less',
 +              ],
 +      ],
        'jquery.textSelection' => [
                'scripts' => 'resources/src/jquery/jquery.textSelection.js',
                'dependencies' => 'jquery.client',
        ],
        'mediawiki.messagePoster' => [
                'scripts' => [
 -                      'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js',
 -                      'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.MessagePoster.js',
 +                      'resources/src/mediawiki.messagePoster/factory.js',
 +                      'resources/src/mediawiki.messagePoster/MessagePoster.js',
                ],
                'dependencies' => [
                        'oojs',
        ],
        'mediawiki.messagePoster.wikitext' => [
                'scripts' => [
 -                      'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.WikitextMessagePoster.js',
 +                      'resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js',
                ],
                'dependencies' => [
                        'mediawiki.api.edit',
        ],
        'mediawiki.notification' => [
                'styles' => [
-                       'resources/src/mediawiki/mediawiki.notification.common.css',
-                       'resources/src/mediawiki/mediawiki.notification.print.css'
+                       'resources/src/mediawiki.notification/common.css',
+                       'resources/src/mediawiki.notification/print.css'
                                => [ 'media' => 'print' ],
                ],
                'skinStyles' => [
-                       'default' => 'resources/src/mediawiki/mediawiki.notification.css',
+                       'default' => 'resources/src/mediawiki.notification/default.css',
                ],
-               'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
+               'scripts' => 'resources/src/mediawiki.notification/notification.js',
                'dependencies' => [
                        'mediawiki.util',
                        'mediawiki.visibleTimeout',
                        'oojs-ui.styles.icons-alerts',
                        'oojs-ui.styles.icons-interactions',
                ],
 +              'messages' => [
 +                      'ooui-field-help'
 +              ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        // This contains only the styles required by core widgets.