Merge "mediawiki.notification: Move files to their own directory"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 095ca75..2a343c9 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -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,
@@ -328,8 +321,8 @@ return [
                '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',
@@ -337,6 +330,12 @@ return [
                        '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',
@@ -1135,8 +1134,8 @@ return [
        ],
        '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',
@@ -1147,7 +1146,7 @@ return [
        ],
        'mediawiki.messagePoster.wikitext' => [
                'scripts' => [
-                       'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.WikitextMessagePoster.js',
+                       'resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js',
                ],
                'dependencies' => [
                        'mediawiki.api.edit',
@@ -1157,14 +1156,14 @@ return [
        ],
        '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',
@@ -1627,7 +1626,10 @@ return [
        ],
 
        'mediawiki.libs.pluralruleparser' => [
-               'scripts' => 'resources/src/mediawiki.libs/CLDRPluralRuleParser.js',
+               'scripts' => [
+                       'resources/lib/CLDRPluralRuleParser/CLDRPluralRuleParser.js',
+                       'resources/src/mediawiki.libs.pluralruleparser/export.js',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -1667,7 +1669,10 @@ return [
        /* MediaWiki Libs */
 
        'mediawiki.libs.jpegmeta' => [
-               'scripts' => 'resources/src/mediawiki.libs/mediawiki.libs.jpegmeta.js',
+               'scripts' => [
+                       'resources/src/mediawiki.libs.jpegmeta/jpegmeta.js',
+                       'resources/src/mediawiki.libs.jpegmeta/export.js',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
 
@@ -2161,7 +2166,7 @@ return [
                'scripts' => [
                        'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
-                       'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
                ],
@@ -2178,6 +2183,35 @@ return [
                ],
        ],
        'mediawiki.special.preferences.styles' => [
+               'targets' => [ 'desktop', 'mobile' ],
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css',
+       ],
+       'mediawiki.special.preferences.ooui' => [
+               'targets' => [ 'desktop', 'mobile' ],
+               'scripts' => [
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
+               ],
+               'messages' => [
+                       'prefs-tabs-navigation-hint',
+                       'prefswarning-warning',
+                       'saveprefs',
+                       'savedprefs',
+               ],
+               'dependencies' => [
+                       'mediawiki.language',
+                       'mediawiki.confirmCloseWindow',
+                       'mediawiki.notification.convertmessagebox',
+                       'oojs-ui-widgets',
+                       'mediawiki.widgets.SelectWithInputWidget',
+                       'mediawiki.editfont.styles',
+               ],
+       ],
+       'mediawiki.special.preferences.styles.ooui' => [
                'targets' => [ 'desktop', 'mobile' ],
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
        ],
@@ -2846,6 +2880,9 @@ return [
                        '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.