X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=53d0c310c09374e94ee8367751057b612620c02d;hb=056cfae3131ab3beee4310b809aa3422aa1cf052;hp=73896b860d08d03d154390ff4e564fa55e0737ec;hpb=d3809b56347031ef099d4a196f9ea9c600d64bc8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 73896b860d..53d0c310c0 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -113,7 +113,6 @@ return array(
 		// skin over-rides common content styling.
 		'skinStyles' => array(
 			'default' => 'resources/src/mediawiki.skinning/content.parsoid.less',
-			'minerva' => array(),
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),
@@ -329,10 +328,6 @@ return array(
 				'resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css',
 				'resources/lib/jquery.ui/themes/smoothness/jquery.ui.theme.css',
 			),
-			'vector' => array(
-				'resources/src/jquery.ui-themes/vector/jquery.ui.core.css',
-				'resources/src/jquery.ui-themes/vector/jquery.ui.theme.css',
-			),
 		),
 		'group' => 'jquery.ui',
 	),
@@ -344,7 +339,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.accordion.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.accordion.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -358,7 +352,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.autocomplete.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.autocomplete.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -370,7 +363,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.button.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.button.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -379,7 +371,6 @@ return array(
 		'dependencies' => 'jquery.ui.core',
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.datepicker.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.datepicker.css',
 		),
 		'languageScripts' => array(
 			'af' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-af.js',
@@ -465,7 +456,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.dialog.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.dialog.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -497,7 +487,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.menu.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.menu.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -518,7 +507,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.progressbar.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.progressbar.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -531,7 +519,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.resizable.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.resizable.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -544,7 +531,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.selectable.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.selectable.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -557,7 +543,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.slider.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.slider.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -579,7 +564,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.spinner.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.spinner.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -591,7 +575,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tabs.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.tabs.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -604,7 +587,6 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/jquery.ui/themes/smoothness/jquery.ui.tooltip.css',
-			'vector' => 'resources/src/jquery.ui-themes/vector/jquery.ui.tooltip.css',
 		),
 		'group' => 'jquery.ui',
 	),
@@ -1052,6 +1034,7 @@ return array(
 	'mediawiki.action.edit.editWarning' => array(
 		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
 		'dependencies' => array(
+			'jquery.textSelection',
 			'mediawiki.jqueryMsg'
 		),
 		'messages' => array(
@@ -1059,10 +1042,6 @@ return array(
 			'prefs-editing'
 		),
 	),
-	// Alias for backwards compatibility
-	'mediawiki.action.watch.ajax' => array(
-		'dependencies' => 'mediawiki.page.watch.ajax'
-	),
 
 	/* MediaWiki Language */
 
@@ -1200,7 +1179,11 @@ return array(
 	),
 	'mediawiki.page.image.pagination' => array(
 		'scripts' => 'resources/src/mediawiki.page/mediawiki.page.image.pagination.js',
-		'dependencies' => array( 'jquery.spinner' )
+		'dependencies' => array(
+			'mediawiki.Uri',
+			'mediawiki.util',
+			'jquery.spinner',
+		),
 	),
 
 	/* MediaWiki Special pages */
@@ -1208,9 +1191,6 @@ return array(
 	'mediawiki.special' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.js',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.css',
-		'skinStyles' => array(
-			'vector' => 'skins/Vector/special.less', // FIXME this should use $wgStyleDirectory
-		),
 	),
 	'mediawiki.special.block' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
@@ -1260,9 +1240,6 @@ return array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.preferences.js',
 		'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.css',
 		'position' => 'top',
-		'skinStyles' => array(
-			'vector' => 'skins/Vector/special.preferences.less', // FIXME this should use $wgStyleDirectory
-		),
 		'messages' => array(
 			'prefs-tabs-navigation-hint',
 		),
@@ -1460,6 +1437,13 @@ return array(
 		'position' => 'top',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
+	'mediawiki.ui.input' => array(
+		'styles' => array(
+			'resources/src/mediawiki.ui/components/inputs.less',
+		),
+		'position' => 'top',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 
 	/* es5-shim */
 	'es5-shim' => array(
@@ -1494,6 +1478,7 @@ return array(
 		),
 		'skinStyles' => array(
 			'default' => 'resources/lib/oojs-ui/oojs-ui-apex.css',
+			// FIXME As of July 2014, this is to be gone "in a couple of months".
 			'minerva' => 'resources/lib/oojs-ui/oojs-ui-agora.css',
 		),
 		'messages' => array(