Merge "Make interwiki transclusion use the WAN cache"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index a06a25f..c40ef93 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -136,7 +136,9 @@ return [
                ],
        ],
 
-       /* jQuery */
+       /* Base modules */
+       // These modules' dependencies MUST also be included in StartUpModule::getBaseModules().
+       // These modules' dependencies MUST be dependency-free (having dependencies would cause recursion).
 
        'jquery' => [
                'scripts' => [
@@ -145,6 +147,20 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.base' => [
+               'scripts' => [
+                       // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
+                       'resources/src/mediawiki.base/mediawiki.errorLogger.js',
+                       'resources/src/mediawiki.base/mediawiki.base.js',
+               ],
+               'dependencies' => 'jquery',
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
+       'mediawiki.legacy.wikibits' => [
+               'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
+               'dependencies' => 'jquery',
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
 
        /* jQuery Plugins */
 
@@ -158,7 +174,7 @@ return [
                'targets' => [ 'mobile', 'desktop' ],
        ],
        'jquery.async' => [
-               'scripts' => 'resources/lib/jquery/jquery.async.js',
+               'scripts' => 'resources/lib/jquery.async.js',
        ],
        'jquery.byteLength' => [
                'scripts' => 'resources/src/jquery/jquery.byteLength.js',
@@ -205,17 +221,14 @@ return [
                'dependencies' => 'mediawiki.jqueryMsg',
        ],
        'jquery.cookie' => [
-               'scripts' => 'resources/lib/jquery/jquery.cookie.js',
+               'scripts' => 'resources/lib/jquery.cookie.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'jquery.expandableField' => [
-               'scripts' => 'resources/src/jquery/jquery.expandableField.js',
-       ],
        'jquery.form' => [
-               'scripts' => 'resources/lib/jquery/jquery.form.js',
+               'scripts' => 'resources/lib/jquery.form.js',
        ],
        'jquery.fullscreen' => [
-               'scripts' => 'resources/lib/jquery/jquery.fullscreen.js',
+               'scripts' => 'resources/lib/jquery.fullscreen.js',
        ],
        'jquery.getAttrs' => [
                'targets' => [ 'desktop', 'mobile' ],
@@ -235,7 +248,7 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.hoverIntent' => [
-               'scripts' => 'resources/lib/jquery/jquery.hoverIntent.js',
+               'scripts' => 'resources/lib/jquery.hoverIntent.js',
        ],
        'jquery.i18n' => [
                'scripts' => [
@@ -282,7 +295,7 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.mockjax' => [
-               'scripts' => 'resources/lib/jquery/jquery.mockjax.js',
+               'scripts' => 'resources/lib/jquery.mockjax.js',
        ],
        'jquery.mw-jump' => [
                'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
@@ -300,7 +313,7 @@ return [
        ],
        'jquery.jStorage' => [
                'deprecated' => 'Please use "mediawiki.storage" instead.',
-               'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
+               'scripts' => 'resources/lib/jquery.jStorage.js',
        ],
        'jquery.suggestions' => [
                'targets' => [ 'desktop', 'mobile' ],
@@ -327,11 +340,11 @@ return [
                'targets' => [ 'mobile', 'desktop' ],
        ],
        'jquery.throttle-debounce' => [
-               'scripts' => 'resources/lib/jquery/jquery.ba-throttle-debounce.js',
+               'scripts' => 'resources/lib/jquery.ba-throttle-debounce.js',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.xmldom' => [
-               'scripts' => 'resources/lib/jquery/jquery.xmldom.js',
+               'scripts' => 'resources/lib/jquery.xmldom.js',
        ],
 
        /* jQuery Tipsy */
@@ -831,18 +844,6 @@ return [
        ],
 
        /* MediaWiki */
-
-       'mediawiki.base' => [
-               'scripts' => [
-                       // This MUST be kept in sync with maintenance/jsduck/eg-iframe.html
-                       'resources/src/mediawiki.base/mediawiki.errorLogger.js',
-                       'resources/src/mediawiki.base/mediawiki.base.js',
-               ],
-               // - These dependencies MUST NOT also have dependencies (would cause recursion).
-               // - These dependencies MUST also be returned from StartUpModule::getBaseModules().
-               'dependencies' => 'jquery',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
        'mediawiki.apihelp' => [
                'styles' => 'resources/src/mediawiki.apihelp.css',
                'targets' => [ 'desktop' ],
@@ -1295,7 +1296,6 @@ return [
        ],
        'mediawiki.ForeignStructuredUpload.BookletLayout' => [
                'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.js',
-               'styles' => 'resources/src/mediawiki.ForeignStructuredUpload.BookletLayout/BookletLayout.less',
                'dependencies' => [
                        'mediawiki.ForeignStructuredUpload',
                        'mediawiki.Upload.BookletLayout',
@@ -2391,10 +2391,6 @@ return [
                        'resources/src/mediawiki.legacy/oldshared.css' => [ 'media' => 'screen' ]
                ],
        ],
-       'mediawiki.legacy.wikibits' => [
-               'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
 
        /* MediaWiki UI */
 
@@ -2633,6 +2629,15 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.widgets.CheckMatrixWidget' => [
+               'scripts' => [
+                       'resources/src/mediawiki.widgets/mw.widgets.CheckMatrixWidget.js',
+               ],
+               'dependencies' => [
+                       'oojs-ui-core',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.widgets.CategoryMultiselectWidget' => [
                'scripts' => [
                        'resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js',
@@ -2872,9 +2877,9 @@ return [
        'oojs-ui-widgets' => [
                'class' => ResourceLoaderOOUIFileModule::class,
                'scripts' => 'resources/lib/oojs-ui/oojs-ui-widgets.js',
+               'themeStyles' => 'widgets',
                'dependencies' => [
                        'oojs-ui-core',
-                       'oojs-ui-widgets.styles',
                        'oojs-ui.styles.icons-interactions',
                        'oojs-ui.styles.icons-content',
                        'oojs-ui.styles.icons-editing-advanced',
@@ -2961,6 +2966,10 @@ return [
                'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-editing-advanced',
        ],
+       'oojs-ui.styles.icons-editing-citation' => [
+               'class' => ResourceLoaderOOUIImageModule::class,
+               'themeImages' => 'icons-editing-citation',
+       ],
        'oojs-ui.styles.icons-editing-core' => [
                'class' => ResourceLoaderOOUIImageModule::class,
                'themeImages' => 'icons-editing-core',