Merge "Declare dynamic properties"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 8234e89..180ed65 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' => [
@@ -177,11 +175,10 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.color' => [
-               'scripts' => 'resources/src/jquery/jquery.color.js',
-               'dependencies' => 'jquery.colorUtil',
-       ],
-       'jquery.colorUtil' => [
-               'scripts' => 'resources/src/jquery/jquery.colorUtil.js',
+               'scripts' => [
+                       'resources/src/jquery.color/jquery.colorUtil.js',
+                       'resources/src/jquery.color/jquery.color.js',
+               ],
        ],
        'jquery.confirmable' => [
                'scripts' => [
@@ -214,7 +211,7 @@ return [
        'jquery.highlightText' => [
                'scripts' => 'resources/src/jquery/jquery.highlightText.js',
                'dependencies' => [
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -290,7 +287,7 @@ return [
                'messages' => [ 'sort-descending', 'sort-ascending' ],
                'dependencies' => [
                        'jquery.tablesorter.styles',
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                        'mediawiki.language.months',
                ],
        ],
@@ -757,7 +754,7 @@ return [
                ],
                'dependencies' => [
                        'mediawiki.language',
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -897,6 +894,7 @@ return [
                'dependencies' => [
                        'mediawiki.api',
                        'oojs',
+                       'mediawiki.Uri',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -928,7 +926,7 @@ return [
                        'resources/src/mediawiki.htmlform/selectorother.js',
                ],
                'dependencies' => [
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                        'jquery.lengthLimit',
                ],
                'messages' => [
@@ -943,7 +941,7 @@ return [
                        'resources/src/mediawiki.htmlform.checker.js',
                ],
                'dependencies' => [
-                       'jquery.throttle-debounce',
+                       'mediawiki.util',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -972,7 +970,7 @@ return [
                'scripts' => 'resources/src/mediawiki.inspect.js',
                'dependencies' => [
                        'mediawiki.String',
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -1032,8 +1030,11 @@ return [
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.RegExp' => [
-               'scripts' => 'resources/src/mediawiki.RegExp.js',
+               'deprecated' => 'Please use mw.util.escapeRegExp() instead.',
                'targets' => [ 'desktop', 'mobile' ],
+               'dependencies' => [
+                       'mediawiki.util',
+               ],
        ],
        'mediawiki.String' => [
                'scripts' => 'resources/src/mediawiki.String.js',
@@ -1254,19 +1255,20 @@ 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',
-                       'mediawiki.RegExp',
+                       'jquery.client',
                ],
+               'messages' => [ 'brackets', 'word-separator' ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.viewport' => [
@@ -1663,8 +1665,8 @@ return [
        'mediawiki.page.ready' => [
                'scripts' => 'resources/src/mediawiki.page.ready.js',
                'dependencies' => [
-                       'jquery.accessKeyLabel',
                        'jquery.checkboxShiftClick',
+                       'mediawiki.util',
                        'mediawiki.notify',
                        'mediawiki.api'
                ],
@@ -1702,8 +1704,6 @@ return [
                        'mediawiki.util',
                        'mediawiki.Title',
                        'mediawiki.jqueryMsg',
-                       'jquery.accessKeyLabel',
-                       'mediawiki.RegExp',
                ],
                'messages' => [
                        'watch',
@@ -1860,11 +1860,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',
                        ],
@@ -2320,7 +2316,6 @@ return [
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.jqueryMsg',
-                       'jquery.throttle-debounce',
                        'mediawiki.htmlform.checker',
                ],
        ],
@@ -2646,7 +2641,7 @@ return [
                        'period-pm',
                ],
                'dependencies' => [
-                       'mediawiki.RegExp',
+                       'mediawiki.util',
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-moderation',
                        'oojs-ui.styles.icons-movement',