From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 29 Jun 2016 16:07:15 +0000 (+0000)
Subject: Merge "Resources: Remove very old comment about OOjs UI incompatibility"
X-Git-Tag: 1.31.0-rc.0~6496
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=5baa49450c303cfd603063c77440a02c06003a03;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Resources: Remove very old comment about OOjs UI incompatibility"
---

5baa49450c303cfd603063c77440a02c06003a03
diff --combined resources/Resources.php
index e31e77e8c7,18a1b99e7f..7f4e132441
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -33,7 -33,6 +33,7 @@@ return 
  
  	// Scripts managed by the local wiki (stored in the MediaWiki namespace)
  	'site' => [ 'class' => 'ResourceLoaderSiteModule' ],
 +	'site.styles' => [ 'class' => 'ResourceLoaderSiteStylesModule' ],
  	'noscript' => [
  		'class' => 'ResourceLoaderWikiModule',
  		'styles' => [ 'MediaWiki:Noscript.css' ],
@@@ -1408,16 -1407,12 +1408,16 @@@
  	/* MediaWiki Action */
  
  	'mediawiki.action.edit' => [
 -		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
 +		'scripts' => [
 +			'resources/src/mediawiki.action/mediawiki.action.edit.js',
 +			'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
 +		],
  		'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
  		'dependencies' => [
  			'mediawiki.action.edit.styles',
  			'jquery.textSelection',
  			'jquery.byteLimit',
 +			'mediawiki.api',
  		],
  		'position' => 'top',
  	],
@@@ -1460,14 -1455,18 +1460,14 @@@
  			'previewerrortext',
  		],
  	],
 -	'mediawiki.action.edit.stash' => [
 -		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
 -		'dependencies' => [
 -			'jquery.getAttrs',
 -			'mediawiki.api',
 -		],
 -	],
  	'mediawiki.action.history' => [
 -		'position' => 'top',
  		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
  		'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
  	],
 +	'mediawiki.action.history.styles' => [
 +		'position' => 'top',
 +		'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
 +	],
  	'mediawiki.action.history.diff' => [
  		'position' => 'top',
  		'styles' => [
@@@ -2352,7 -2351,5 +2352,5 @@@
  	],
  
  	/* OOjs UI */
- 	// WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to break
- 	// if loaded in browsers that don't support ES5
  	// @see ResourcesOOUI.php
  ];