Merge "mediawiki.util: Merge 'jquery.accessKeyLabel' into this module"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 72fe627..cfcfc19 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -156,12 +156,10 @@ return [
        /* jQuery Plugins */
 
        'jquery.accessKeyLabel' => [
-               'scripts' => 'resources/src/jquery/jquery.accessKeyLabel.js',
+               'deprecated' => 'Please use "mediawiki.util" instead.',
                'dependencies' => [
-                       'jquery.client',
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                ],
-               'messages' => [ 'brackets', 'word-separator' ],
                'targets' => [ 'mobile', 'desktop' ],
        ],
        'jquery.checkboxShiftClick' => [
@@ -942,9 +940,6 @@ return [
                'scripts' => [
                        'resources/src/mediawiki.htmlform.checker.js',
                ],
-               'dependencies' => [
-                       'jquery.throttle-debounce',
-               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.htmlform.ooui' => [
@@ -1254,19 +1249,21 @@ return [
                ]
        ],
        'mediawiki.util' => [
-               'localBasePath' => "$IP/resources/src",
-               'remoteBasePath' => "$wgResourceBasePath/resources/src",
+               'localBasePath' => "$IP/resources/src/mediawiki.util/",
+               'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util/",
                'packageFiles' => [
-                       'mediawiki.util.js',
+                       'util.js',
+                       'jquery.accessKeyLabel.js',
                        [ 'name' => 'config.json', 'config' => [
                                'FragmentMode',
                                'LoadScript',
                        ] ],
                ],
                'dependencies' => [
-                       'jquery.accessKeyLabel',
+                       'jquery.client',
                        'mediawiki.RegExp',
                ],
+               'messages' => [ 'brackets', 'word-separator' ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.viewport' => [
@@ -1376,7 +1373,7 @@ return [
                        'oojs-ui-core',
                ],
                'messages' => [
-                       // Keep the uses message keys in sync with EditPage#setHeaders
+                       // Keep these message keys in sync with EditPage#setHeaders
                        'creating',
                        'editconflict',
                        'editing',
@@ -1663,8 +1660,8 @@ return [
        'mediawiki.page.ready' => [
                'scripts' => 'resources/src/mediawiki.page.ready.js',
                'dependencies' => [
-                       'jquery.accessKeyLabel',
                        'jquery.checkboxShiftClick',
+                       'mediawiki.util',
                        'mediawiki.notify',
                        'mediawiki.api'
                ],
@@ -1702,7 +1699,6 @@ return [
                        'mediawiki.util',
                        'mediawiki.Title',
                        'mediawiki.jqueryMsg',
-                       'jquery.accessKeyLabel',
                        'mediawiki.RegExp',
                ],
                'messages' => [
@@ -1860,11 +1856,7 @@ return [
                        'styles/mw.rcfilters.ui.FilterTagMultiselectWidgetMobile.less'
                ],
                'skinStyles' => [
-                       'vector' => [
-                               'styles/mw.rcfilters.ui.Overlay.vector.less',
-                       ],
                        'monobook' => [
-                               'styles/mw.rcfilters.ui.Overlay.monobook.less',
                                'styles/mw.rcfilters.ui.CapsuleItemWidget.monobook.less',
                                'styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less',
                        ],