From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 18 Sep 2017 15:18:10 +0000 (+0000)
Subject: Merge "Split mediawiki.special.preferences into separate file for each function"
X-Git-Tag: 1.31.0-rc.0~2071
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=870a34e2ccf2649fdcc41a951d336377a948ab06;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Split mediawiki.special.preferences into separate file for each function"
---

870a34e2ccf2649fdcc41a951d336377a948ab06
diff --combined resources/Resources.php
index 246d9f3222,52dccdbc4c..818112f54c
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1451,7 -1451,6 +1451,7 @@@ return 
  			'jquery.textSelection',
  			'mediawiki.api',
  			'mediawiki.diff.styles',
 +			'mediawiki.language',
  			'mediawiki.util',
  			'mediawiki.jqueryMsg',
  			'oojs-ui-core',
@@@ -2093,7 -2092,12 +2093,12 @@@
  		'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
  	],
  	'mediawiki.special.preferences' => [
- 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.preferences.js',
+ 		'scripts' => [
+ 			'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
+ 			'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
+ 			'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
+ 			'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
+ 		],
  		'messages' => [
  			'prefs-tabs-navigation-hint',
  			'prefswarning-warning',