From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 9 May 2018 18:14:07 +0000 (+0000)
Subject: Merge "mediawiki.notification: Move files to their own directory"
X-Git-Tag: 1.34.0-rc.0~5476
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=c4a1570f332352434b89fed1f17306a320347642;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "mediawiki.notification: Move files to their own directory"
---

c4a1570f332352434b89fed1f17306a320347642
diff --combined resources/Resources.php
index b0c91cafd0,97f35e1274..2a343c970d
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -112,6 -112,13 +112,6 @@@ return 
  			'resources/src/mediawiki.skinning/interface.css' => [ 'media' => 'screen' ],
  		],
  	],
 -
 -	'jquery.tablesorter.styles' => [
 -		'targets' => [ 'desktop', 'mobile' ],
 -		'styles' => [
 -			'resources/src/jquery/jquery.tablesorter.styles.less',
 -		],
 -	],
  	'jquery.makeCollapsible.styles' => [
  		'targets' => [ 'desktop', 'mobile' ],
  		'class' => ResourceLoaderLessVarFileModule::class,
@@@ -321,8 -328,8 +321,8 @@@
  		'scripts' => 'resources/src/jquery/jquery.tabIndex.js',
  	],
  	'jquery.tablesorter' => [
 -		'scripts' => 'resources/src/jquery/jquery.tablesorter.js',
 -		'styles' => 'resources/src/jquery/jquery.tablesorter.less',
 +		'scripts' => 'resources/src/jquery.tablesorter/jquery.tablesorter.js',
 +		'styles' => 'resources/src/jquery.tablesorter/jquery.tablesorter.less',
  		'messages' => [ 'sort-descending', 'sort-ascending' ],
  		'dependencies' => [
  			'jquery.tablesorter.styles',
@@@ -330,12 -337,6 +330,12 @@@
  			'mediawiki.language.months',
  		],
  	],
 +	'jquery.tablesorter.styles' => [
 +		'targets' => [ 'desktop', 'mobile' ],
 +		'styles' => [
 +			'resources/src/jquery/jquery.tablesorter.styles.less',
 +		],
 +	],
  	'jquery.textSelection' => [
  		'scripts' => 'resources/src/jquery/jquery.textSelection.js',
  		'dependencies' => 'jquery.client',
@@@ -1134,8 -1135,8 +1134,8 @@@
  	],
  	'mediawiki.messagePoster' => [
  		'scripts' => [
 -			'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js',
 -			'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.MessagePoster.js',
 +			'resources/src/mediawiki.messagePoster/factory.js',
 +			'resources/src/mediawiki.messagePoster/MessagePoster.js',
  		],
  		'dependencies' => [
  			'oojs',
@@@ -1146,7 -1147,7 +1146,7 @@@
  	],
  	'mediawiki.messagePoster.wikitext' => [
  		'scripts' => [
 -			'resources/src/mediawiki.messagePoster/mediawiki.messagePoster.WikitextMessagePoster.js',
 +			'resources/src/mediawiki.messagePoster.wikitext/WikitextMessagePoster.js',
  		],
  		'dependencies' => [
  			'mediawiki.api.edit',
@@@ -1156,14 -1157,14 +1156,14 @@@
  	],
  	'mediawiki.notification' => [
  		'styles' => [
- 			'resources/src/mediawiki/mediawiki.notification.common.css',
- 			'resources/src/mediawiki/mediawiki.notification.print.css'
+ 			'resources/src/mediawiki.notification/common.css',
+ 			'resources/src/mediawiki.notification/print.css'
  				=> [ 'media' => 'print' ],
  		],
  		'skinStyles' => [
- 			'default' => 'resources/src/mediawiki/mediawiki.notification.css',
+ 			'default' => 'resources/src/mediawiki.notification/default.css',
  		],
- 		'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
+ 		'scripts' => 'resources/src/mediawiki.notification/notification.js',
  		'dependencies' => [
  			'mediawiki.util',
  			'mediawiki.visibleTimeout',
@@@ -2880,9 -2881,6 +2880,9 @@@
  			'oojs-ui.styles.icons-alerts',
  			'oojs-ui.styles.icons-interactions',
  		],
 +		'messages' => [
 +			'ooui-field-help'
 +		],
  		'targets' => [ 'desktop', 'mobile' ],
  	],
  	// This contains only the styles required by core widgets.