X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=71a5f61e75fa3bb96749f54cff4f7896a970f93b;hb=1bf2f48f6606e50d96959bd1bd54bc10cfbf888c;hp=50aabb0dd24353f63a348d86c5ce27c514057d8c;hpb=21a7aa4ff59c7fbae8b7aa5650c84c746d2ebd8a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 50aabb0dd2..71a5f61e75 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -132,9 +132,14 @@ return [
 	/* jQuery */
 
 	'jquery' => [
-		'scripts' => [
-			'resources/lib/jquery/jquery.js',
-		],
+		'scripts' => ( $GLOBALS['wgUsejQueryThree'] ?
+			[
+				'resources/lib/jquery/jquery3.js',
+				'resources/lib/jquery/jquery.migrate.js',
+			] : [
+				'resources/lib/jquery/jquery.js',
+			]
+		),
 		'raw' => true,
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -300,6 +305,8 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.placeholder' => [
+		'deprecated' => 'Use of "jquery.placeholder" is deprecated since MediaWiki 1.29.0',
+
 		'scripts' => 'resources/src/jquery/jquery.placeholder.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -308,11 +315,6 @@ return [
 		'styles' => 'resources/lib/qunitjs/qunit.css',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'jquery.qunit.completenessTest' => [
-		'scripts' => 'resources/src/jquery/jquery.qunit.completenessTest.js',
-		'dependencies' => 'jquery.qunit',
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 	'jquery.spinner' => [
 		'scripts' => 'resources/src/jquery/jquery.spinner.js',
 		'styles' => 'resources/src/jquery/jquery.spinner.css',
@@ -720,8 +722,6 @@ return [
 	],
 
 	/* json2 */
-
-	// Deprecated since MediaWiki 1.29.0
 	'json' => [
 		'deprecated' => 'Use of the "json" module is deprecated since MediaWiki 1.29.0',
 		'targets' => [ 'desktop', 'mobile' ],
@@ -1183,7 +1183,6 @@ return [
 			'searchsuggest-containing',
 		],
 		'dependencies' => [
-			'jquery.placeholder',
 			'jquery.suggestions',
 			'jquery.getAttrs',
 			'mediawiki.api',
@@ -1307,7 +1306,7 @@ return [
 		'dependencies' => [
 			'mediawiki.ForeignStructuredUpload',
 			'mediawiki.Upload.BookletLayout',
-			'mediawiki.widgets.CategorySelector',
+			'mediawiki.widgets.CategoryMultiselectWidget',
 			'mediawiki.widgets.DateInputWidget',
 			'mediawiki.jqueryMsg',
 			'mediawiki.api.messages',
@@ -1347,11 +1346,6 @@ return [
 		'dependencies' => 'mediawiki.util',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'mediawiki.user.blockcookie' => [
-		'scripts' => 'resources/src/mediawiki/mediawiki.user.blockcookie.js',
-		'dependencies' => [ 'mediawiki.cookie', 'mediawiki.storage' ],
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 	'mediawiki.user' => [
 		'scripts' => 'resources/src/mediawiki/mediawiki.user.js',
 		'dependencies' => [
@@ -1666,7 +1660,6 @@ return [
 		'dependencies' => [
 			'jquery.accessKeyLabel',
 			'jquery.checkboxShiftClick',
-			'jquery.placeholder',
 			'jquery.mw-jump',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
@@ -1763,11 +1756,12 @@ return [
 	'mediawiki.rcfilters.filters.ui' => [
 		'scripts' => [
 			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js',
-			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js',
-			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterGroupWidget.js',
-			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js',
-			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js',
-			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.js',
+			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js',
+			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js',
+			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js',
+			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js',
+			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js',
+			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterFloatingMenuSelectWidget.js',
 			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',
 			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',
 			'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js',
@@ -1781,21 +1775,27 @@ return [
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.variables.less',
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less',
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less',
-			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less',
-			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.less',
-			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterGroupWidget.less',
-			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FiltersListWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagItemWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterFloatingMenuSelectWidget.less',
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less',
-			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterCapsuleMultiselectWidget.less',
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less',
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less',
 			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less',
 		],
+		'skinStyles' => [
+			'monobook' => [
+				'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.monobook.less',
+				'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.CapsuleItemWidget.monobook.less',
+			],
+		],
 		'messages' => [
 			'rcfilters-activefilters',
 			'rcfilters-restore-default-filters',
 			'rcfilters-clear-all-filters',
-			'rcfilters-clear-filters-to-defaults',
 			'rcfilters-search-placeholder',
 			'rcfilters-invalid-filter',
 			'rcfilters-empty-filter',
@@ -1815,6 +1815,7 @@ return [
 		'dependencies' => [
 			'oojs-ui',
 			'mediawiki.language',
+			'mediawiki.user',
 			'mediawiki.rcfilters.filters.dm',
 			'oojs-ui.styles.icons-moderation',
 			'oojs-ui.styles.icons-editing-core',
@@ -2157,7 +2158,6 @@ return [
 	],
 	'mediawiki.legacy.wikibits' => [
 		'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
-		'dependencies' => 'mediawiki.util',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 
@@ -2361,9 +2361,15 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.widgets.CategorySelector' => [
+		'deprecated' => 'Use "mw.widgets.CategoryMultiselectWidget" instead. See T161285.',
+		'dependencies' => [
+			'mediawiki.widgets.CategoryMultiselectWidget',
+		],
+	],
+	'mediawiki.widgets.CategoryMultiselectWidget' => [
 		'scripts' => [
 			'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',
-			'resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js',
+			'resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js',
 		],
 		'dependencies' => [
 			'oojs-ui-widgets',
@@ -2373,7 +2379,7 @@ return [
 		],
 		'messages' => [
 			'red-link-title',
-			'mw-widgets-categoryselector-add-category-placeholder'
+			'mw-widgets-categoryselector-add-category-placeholder',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -2452,18 +2458,14 @@ return [
 			'oojs-ui-core',
 		],
 	],
+
 	/* es5-shim */
 	'es5-shim' => [
-		'scripts' => [
-			'resources/lib/es5-shim/es5-shim.js',
-			'resources/src/polyfill-object-create.js',
-		],
+		'deprecated' => 'Use of the "es5-shim" module is deprecated since MediaWiki 1.29.0',
 		'targets' => [ 'desktop', 'mobile' ],
-		'skipFunction' => 'resources/src/es5-skip.js',
 	],
 
 	/* dom-level2-shim */
-	// Deprecated since MediaWiki 1.29.0
 	'dom-level2-shim' => [
 		'deprecated' => 'Use of the "dom-level2-shim" module is deprecated since MediaWiki 1.29.0',
 		'targets' => [ 'desktop', 'mobile' ],
@@ -2476,9 +2478,6 @@ return [
 			'resources/src/oojs-global.js',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
-		'dependencies' => [
-			'es5-shim',
-		],
 	],
 
 	'mediawiki.router' => [