Merge "Update old URLs in DefaultSettings related to Squid caching"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index b3aee84..bcbe96d 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -163,7 +163,10 @@ return [
                'targets' => [ 'mobile', 'desktop' ],
        ],
        'jquery.checkboxShiftClick' => [
-               'scripts' => 'resources/src/jquery/jquery.checkboxShiftClick.js',
+               'deprecated' => 'Please use "mediawiki.page.ready" instead.',
+               'dependencies' => [
+                       'mediawiki.page.ready',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.chosen' => [
@@ -175,11 +178,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' => [
@@ -895,6 +897,7 @@ return [
                'dependencies' => [
                        'mediawiki.api',
                        'oojs',
+                       'mediawiki.Uri',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -940,6 +943,9 @@ return [
                'scripts' => [
                        'resources/src/mediawiki.htmlform.checker.js',
                ],
+               'dependencies' => [
+                       'mediawiki.util',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.htmlform.ooui' => [
@@ -1028,7 +1034,6 @@ return [
        ],
        'mediawiki.RegExp' => [
                'deprecated' => 'Please use mw.util.escapeRegExp() instead.',
-               'scripts' => 'resources/src/mediawiki.RegExp.js',
                'targets' => [ 'desktop', 'mobile' ],
                'dependencies' => [
                        'mediawiki.util',
@@ -1253,8 +1258,8 @@ return [
                ]
        ],
        'mediawiki.util' => [
-               'localBasePath' => "$IP/resources/src/mediawiki.util/",
-               'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util/",
+               'localBasePath' => "$IP/resources/src/mediawiki.util",
+               'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util",
                'packageFiles' => [
                        'util.js',
                        'jquery.accessKeyLabel.js',
@@ -1661,9 +1666,11 @@ return [
                ]
        ],
        'mediawiki.page.ready' => [
-               'scripts' => 'resources/src/mediawiki.page.ready.js',
+               'scripts' => [
+                       'resources/src/mediawiki.page.ready/checkboxShift.js',
+                       'resources/src/mediawiki.page.ready/ready.js',
+               ],
                'dependencies' => [
-                       'jquery.checkboxShiftClick',
                        'mediawiki.util',
                        'mediawiki.notify',
                        'mediawiki.api'
@@ -1702,7 +1709,6 @@ return [
                        'mediawiki.util',
                        'mediawiki.Title',
                        'mediawiki.jqueryMsg',
-                       'mediawiki.util',
                ],
                'messages' => [
                        'watch',
@@ -2315,7 +2321,6 @@ return [
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.jqueryMsg',
-                       'jquery.throttle-debounce',
                        'mediawiki.htmlform.checker',
                ],
        ],