X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=resources%2FResources.php;h=180ed65a431c8fbf0a8f181f59c3753960ea3c0c;hp=55bd780a5a786a1d9b3240cb1124981c65870944;hb=a48646b3ed92b13de8b06bf2997643240619cd86;hpb=4c6b97966b795d9e032a1f905c4f2c72d75fd1b7

diff --git a/resources/Resources.php b/resources/Resources.php
index 55bd780a5a..180ed65a43 100644
--- 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' => [
@@ -942,6 +940,9 @@ return [
 		'scripts' => [
 			'resources/src/mediawiki.htmlform.checker.js',
 		],
+		'dependencies' => [
+			'mediawiki.util',
+		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.htmlform.ooui' => [
@@ -969,7 +970,7 @@ return [
 		'scripts' => 'resources/src/mediawiki.inspect.js',
 		'dependencies' => [
 			'mediawiki.String',
-			'mediawiki.RegExp',
+			'mediawiki.util',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -1029,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',
@@ -1251,19 +1255,20 @@ return [
 		]
 	],
 	'mediawiki.util' => [
-		'localBasePath' => "$IP/resources/src/mediawiki.util/",
-		'remoteBasePath' => "$wgResourceBasePath/resources/srcmediawiki.util/",
+		'localBasePath' => "$IP/resources/src/mediawiki.util",
+		'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util",
 		'packageFiles' => [
 			'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' => [
@@ -1660,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'
 		],
@@ -1699,8 +1704,6 @@ return [
 			'mediawiki.util',
 			'mediawiki.Title',
 			'mediawiki.jqueryMsg',
-			'jquery.accessKeyLabel',
-			'mediawiki.RegExp',
 		],
 		'messages' => [
 			'watch',
@@ -2313,7 +2316,6 @@ return [
 		'dependencies' => [
 			'mediawiki.api',
 			'mediawiki.jqueryMsg',
-			'jquery.throttle-debounce',
 			'mediawiki.htmlform.checker',
 		],
 	],
@@ -2639,7 +2641,7 @@ return [
 			'period-pm',
 		],
 		'dependencies' => [
-			'mediawiki.RegExp',
+			'mediawiki.util',
 			'oojs-ui-core',
 			'oojs-ui.styles.icons-moderation',
 			'oojs-ui.styles.icons-movement',