X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2FResources.php;h=52fedec533ff15b7162abefa3e2cca22f533f994;hb=ec2330f7f99618e7b7074fa86d3380299d84a419;hp=58a93a727cd802e2dbb3030b587091ad90fa7776;hpb=6199a1c0400262b3ecce43f0d489154f0d796f1b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/Resources.php b/resources/Resources.php
index 58a93a727c..52fedec533 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -29,12 +29,19 @@ return array(
 	/**
 	 * Special modules who have their own classes
 	 */
+	'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
 
 	// Scripts managed by the local wiki (stored in the MediaWiki namespace)
 	'site' => array( 'class' => 'ResourceLoaderSiteModule' ),
-	'noscript' => array( 'class' => 'ResourceLoaderNoscriptModule' ),
-	'startup' => array( 'class' => 'ResourceLoaderStartUpModule' ),
-	'filepage' => array( 'class' => 'ResourceLoaderFilePageModule' ),
+	'noscript' => array(
+		'class' => 'ResourceLoaderWikiModule',
+		'styles' => array( 'MediaWiki:Noscript.css' ),
+		'group' => 'noscript',
+	),
+	'filepage' => array(
+		'class' => 'ResourceLoaderWikiModule',
+		'styles' => array( 'MediaWiki:Filepage.css' ),
+	),
 	'user.groups' => array( 'class' => 'ResourceLoaderUserGroupsModule' ),
 
 	// Scripts managed by the current user (stored in their user space)
@@ -178,7 +185,7 @@ return array(
 		'styles' => 'resources/lib/jquery.chosen/chosen.css',
 	),
 	'jquery.client' => array(
-		'scripts' => 'resources/src/jquery/jquery.client.js',
+		'scripts' => 'resources/lib/jquery.client/jquery.client.js',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'jquery.color' => array(
@@ -765,6 +772,7 @@ return array(
 	/* MediaWiki */
 
 	'mediawiki' => array(
+		// Keep maintenance/jsduck/eg-iframe.html in sync
 		'scripts' => array(
 			'resources/src/mediawiki/mediawiki.js',
 			'resources/src/mediawiki/mediawiki.startUp.js',
@@ -783,6 +791,12 @@ return array(
 		'scripts' => 'resources/src/mediawiki/mediawiki.template.js',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
+	'mediawiki.template.mustache' => array(
+		'scripts' => array(
+			'resources/lib/mustache/mustache.js',
+			'resources/src/mediawiki/mediawiki.template.mustache.js',
+		),
+	),
 	'mediawiki.apipretty' => array(
 		'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
 		'targets' => array( 'desktop', 'mobile' ),
@@ -812,6 +826,11 @@ return array(
 		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.login.js',
 		'dependencies' => 'mediawiki.api',
 	),
+	'mediawiki.api.options' => array(
+		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.options.js',
+		'dependencies' => 'mediawiki.api',
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 	'mediawiki.api.parse' => array(
 		'scripts' => 'resources/src/mediawiki.api/mediawiki.api.parse.js',
 		'dependencies' => 'mediawiki.api',
@@ -884,6 +903,21 @@ return array(
 			'feedback-useragent'
 		),
 	),
+
+	'mediawiki.filewarning' => array(
+		'scripts' => 'resources/src/mediawiki/mediawiki.filewarning.js',
+		'styles' => 'resources/src/mediawiki/mediawiki.filewarning.less',
+		'dependencies' => array(
+			'oojs-ui',
+		),
+	),
+
+	'mediawiki.helplink' => array(
+		'styles' => array(
+			'resources/src/mediawiki/mediawiki.helplink.less',
+		),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
 	'mediawiki.hidpi' => array(
 		'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
 		'dependencies' => 'jquery.hidpi',
@@ -952,14 +986,8 @@ return array(
 		),
 	),
 	'mediawiki.sectionAnchor' => array(
-		'skinStyles' => array(
-			'default' => array(
-				'resources/src/mediawiki/mediawiki.sectionAnchor.css' =>
-					array( 'media' => 'screen'),
-				'resources/src/mediawiki/mediawiki.sectionAnchor.hide.css' =>
-					array( 'media' => 'print' ),
-			),
-		),
+		// Back-compat to hide it on cached pages (T18691; Ie9e334e973; 2015-03-17)
+		'styles' => 'resources/src/mediawiki/mediawiki.sectionAnchor.css',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
 	'mediawiki.Title' => array(
@@ -1057,10 +1085,19 @@ return array(
 			'mediawiki.jqueryMsg',
 		),
 		'messages' => array(
+			// Keep the uses message keys in sync with EditPage#setHeaders
+			'creating',
+			'editconflict',
+			'editing',
+			'editingcomment',
+			'editingsection',
+			'pagetitle',
 			'otherlanguages',
 			'tooltip-p-lang',
 			'summary-preview',
+			'subject-preview',
 			'parentheses',
+			'previewerrortext',
 		),
 	),
 	'mediawiki.action.edit.stash' => array(
@@ -1221,6 +1258,10 @@ return array(
 
 	'mediawiki.language.names' => array( 'class' => 'ResourceLoaderLanguageNamesModule' ),
 
+	'mediawiki.language.specialCharacters' => array(
+		'class' => 'ResourceLoaderSpecialCharacterDataModule'
+	),
+
 	/* MediaWiki Libs */
 
 	'mediawiki.libs.jpegmeta' => array(
@@ -1664,4 +1705,127 @@ return array(
 		),
 		'targets' => array( 'desktop', 'mobile' ),
 	),
+
+	'oojs-ui.styles' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki.css',
+		),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+
+	// FIXME: This is a bit of a mess; T92551 requests fixing
+	'oojs-ui.styles.icons-alerts' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-content' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-content.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-editing-advanced' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-editing-core' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-editing-list' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-editing-styling' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-interactions' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-layout' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-location' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-location.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-media' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-media.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-moderation' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-movement' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-user' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-user.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+	'oojs-ui.styles.icons-wikimedia' => array(
+		'position' => 'top',
+		'skinStyles' => array(
+			'default' => 'resources/lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css',
+		),
+		'dependencies' => array( 'oojs-ui.styles' ),
+		'targets' => array( 'desktop', 'mobile' ),
+	),
+
 );