Merge "resourceloader: Make ResourceLoader::makeLoaderRegisterScript() internal"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 96a76df..e57fce9 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -174,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',
@@ -221,14 +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.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' ],
@@ -248,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' => [
@@ -286,6 +286,7 @@ return [
        ],
        'jquery.localize' => [
                'scripts' => 'resources/src/jquery/jquery.localize.js',
+               'deprecated' => 'Please use "jquery.i18n" instead.',
        ],
        'jquery.makeCollapsible' => [
                'dependencies' => [ 'jquery.makeCollapsible.styles' ],
@@ -295,7 +296,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',
@@ -313,7 +314,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' ],
@@ -340,11 +341,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 */
@@ -1449,6 +1450,7 @@ return [
                        'oojs-ui-core',
                        'mediawiki.widgets.visibleLengthLimit',
                        'mediawiki.api',
+                       'mediawiki.util',
                ],
        ],
        'mediawiki.action.edit.styles' => [
@@ -2629,6 +2631,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',
@@ -2836,8 +2847,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' => [
@@ -2859,7 +2870,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' ],
@@ -2867,7 +2878,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',
@@ -2900,7 +2911,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',
@@ -2916,7 +2927,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',