Merge "Remove untidy wrapper from ImagePage::makeMetadataTable()"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 52e8d49..9603830 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -221,7 +221,7 @@ return [
                'dependencies' => 'mediawiki.jqueryMsg',
        ],
        'jquery.cookie' => [
-               'scripts' => 'resources/lib/jquery.cookie.js',
+               'scripts' => 'resources/lib/jquery.cookie/jquery.cookie.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.form' => [
@@ -2139,42 +2139,15 @@ return [
                        'oojs-ui-core',
                ],
        ],
-       'mediawiki.special.preferences' => [
-               'targets' => [ 'desktop', 'mobile' ],
-               'scripts' => [
-                       'resources/src/mediawiki.special.preferences/confirmClose.js',
-                       'resources/src/mediawiki.special.preferences/convertmessagebox.js',
-                       'resources/src/mediawiki.special.preferences/tabs.legacy.js',
-                       'resources/src/mediawiki.special.preferences/timezone.js',
-                       'resources/src/mediawiki.special.preferences/personalEmail.js',
-               ],
-               'messages' => [
-                       'prefs-tabs-navigation-hint',
-                       'prefswarning-warning',
-                       'saveprefs',
-                       'savedprefs',
-               ],
-               'dependencies' => [
-                       'mediawiki.language',
-                       'mediawiki.confirmCloseWindow',
-                       'mediawiki.notification.convertmessagebox',
-               ],
-       ],
-       'mediawiki.special.preferences.styles' => [
-               'targets' => [ 'desktop', 'mobile' ],
-               // legacy
-               'styles' => 'resources/src/mediawiki.special.preferences.styles.css',
-       ],
        'mediawiki.special.preferences.ooui' => [
                'targets' => [ 'desktop', 'mobile' ],
                'scripts' => [
-                       // FIXME: This uses files already belonging to another module
-                       'resources/src/mediawiki.special.preferences/confirmClose.js',
-                       'resources/src/mediawiki.special.preferences/convertmessagebox.js',
+                       'resources/src/mediawiki.special.preferences.ooui/confirmClose.js',
+                       'resources/src/mediawiki.special.preferences.ooui/convertmessagebox.js',
                        'resources/src/mediawiki.special.preferences.ooui/editfont.js',
                        'resources/src/mediawiki.special.preferences.ooui/tabs.js',
-                       'resources/src/mediawiki.special.preferences/timezone.js',
-                       'resources/src/mediawiki.special.preferences/personalEmail.js',
+                       'resources/src/mediawiki.special.preferences.ooui/timezone.js',
+                       'resources/src/mediawiki.special.preferences.ooui/personalEmail.js',
                ],
                'messages' => [
                        'prefs-tabs-navigation-hint',
@@ -2847,8 +2820,8 @@ return [
        'oojs-ui-core' => [
                'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => [
-                       'resources/lib/oojs-ui/oojs-ui-core.js',
-                       'resources/src/oojs-ui-local.js',
+                       'resources/lib/ooui/oojs-ui-core.js',
+                       'resources/src/ooui-local.js',
                ],
                'themeScripts' => 'core',
                'dependencies' => [
@@ -2870,7 +2843,7 @@ return [
        'oojs-ui-core.styles' => [
                'class' => ResourceLoaderOOUIFileModule::class,
                'styles' => [
-                       'resources/lib/oojs-ui/wikimedia-ui-base.less', // Providing Wikimedia UI LESS variables to all
+                       'resources/lib/ooui/wikimedia-ui-base.less', // Providing Wikimedia UI LESS variables to all
                ],
                'themeStyles' => 'core',
                'targets' => [ 'desktop', 'mobile' ],
@@ -2878,7 +2851,7 @@ return [
        // Additional widgets and layouts module.
        'oojs-ui-widgets' => [
                'class' => ResourceLoaderOOUIFileModule::class,
-               'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
+               'scripts' => 'resources/lib/ooui/oojs-ui-widgets.js',
                'themeStyles' => 'widgets',
                'dependencies' => [
                        'oojs-ui-core',
@@ -2911,7 +2884,7 @@ return [
        // Toolbar and tools module.
        'oojs-ui-toolbars' => [
                'class' => ResourceLoaderOOUIFileModule::class,
-               'scripts' => 'resources/lib/oojs-ui/oojs-ui-toolbars.js',
+               'scripts' => 'resources/lib/ooui/oojs-ui-toolbars.js',
                'themeStyles' => 'toolbars',
                'dependencies' => [
                        'oojs-ui-core',
@@ -2927,7 +2900,7 @@ return [
        // Windows and dialogs module.
        'oojs-ui-windows' => [
                'class' => ResourceLoaderOOUIFileModule::class,
-               'scripts' => 'resources/lib/oojs-ui/oojs-ui-windows.js',
+               'scripts' => 'resources/lib/ooui/oojs-ui-windows.js',
                'themeStyles' => 'windows',
                'dependencies' => [
                        'oojs-ui-core',