X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=resources%2FResources.php;h=1721de807c8d1853b9d478d16761474701593184;hb=856cc85f4b8650038eced7211610fa11dd27c5bd;hp=ce5284628250bcce07b54fb0a7a00df7fc639f8a;hpb=13a2d7b1f9c86ea2727aba4ee6a5df78fbb6f014;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index ce52846282..1721de807c 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' ],
 	],
@@ -715,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' ],
@@ -1178,7 +1183,6 @@ return [
 			'searchsuggest-containing',
 		],
 		'dependencies' => [
-			'jquery.placeholder',
 			'jquery.suggestions',
 			'jquery.getAttrs',
 			'mediawiki.api',
@@ -1656,7 +1660,6 @@ return [
 		'dependencies' => [
 			'jquery.accessKeyLabel',
 			'jquery.checkboxShiftClick',
-			'jquery.placeholder',
 			'jquery.mw-jump',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
@@ -1739,6 +1742,7 @@ return [
 	'mediawiki.rcfilters.filters.dm' => [
 		'scripts' => [
 			'resources/src/mediawiki.rcfilters/mw.rcfilters.js',
+			'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js',
 			'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js',
 			'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js',
 			'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js',
@@ -1753,11 +1757,14 @@ 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.ItemMenuOptionWidget.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.TagItemWidget.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.FloatingMenuSelectWidget.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',
@@ -1771,12 +1778,14 @@ 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.ItemMenuOptionWidget.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.TagItemWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less',
+			'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FloatingMenuSelectWidget.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',
@@ -2153,7 +2162,6 @@ return [
 	],
 	'mediawiki.legacy.wikibits' => [
 		'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
-		'dependencies' => 'mediawiki.util',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 
@@ -2379,6 +2387,18 @@ return [
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
+	'mediawiki.widgets.SelectWithInputWidget' => [
+		'scripts' => 'resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.js',
+		'dependencies' => [
+			'mediawiki.widgets.SelectWithInputWidget.styles',
+			'oojs-ui-widgets',
+		],
+		'targets' => [ 'desktop', 'mobile' ],
+	],
+	'mediawiki.widgets.SelectWithInputWidget.styles' => [
+		'styles' => 'resources/src/mediawiki.widgets/mw.widgets.SelectWithInputWidget.base.css',
+		'targets' => [ 'desktop', 'mobile' ],
+	],
 	'mediawiki.widgets.MediaSearch' => [
 		'scripts' => [
 			'resources/src/mediawiki.widgets/MediaSearch/mw.widgets.APIResultsProvider.js',
@@ -2454,18 +2474,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' ],
@@ -2478,9 +2494,6 @@ return [
 			'resources/src/oojs-global.js',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
-		'dependencies' => [
-			'es5-shim',
-		],
 	],
 
 	'mediawiki.router' => [