From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 2 Mar 2016 01:48:19 +0000 (+0000)
Subject: Merge "mw.Upload.BookletLayout/Dialog: Add determinate progress bar"
X-Git-Tag: 1.31.0-rc.0~7768
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=fb7b3eebeb8de47eb42e8d6ccf204106a2d6d9e4;p=lhc%2Fweb%2Fwiklou.git

Merge "mw.Upload.BookletLayout/Dialog: Add determinate progress bar"
---

fb7b3eebeb8de47eb42e8d6ccf204106a2d6d9e4
diff --cc resources/Resources.php
index 560bad65c1,bb88414dba..dcc02b7e19
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1177,20 -1176,20 +1177,21 @@@ return 
  			'upload-dialog-button-done',
  			'upload-dialog-button-save',
  			'upload-dialog-button-upload',
 -		),
 -	),
 -	'mediawiki.Upload.BookletLayout' => array(
 -		'scripts' => array(
 +		],
 +	],
 +	'mediawiki.Upload.BookletLayout' => [
 +		'scripts' => [
  			'resources/src/mediawiki/mediawiki.Upload.BookletLayout.js',
 -		),
 -		'styles' => array(
 +		],
 +		'styles' => [
  			'resources/src/mediawiki/mediawiki.Upload.BookletLayout.css',
 -		),
 -		'dependencies' => array(
 -			'oojs-ui',
 +		],
 +		'dependencies' => [
 +			'oojs-ui-core',
 +			'oojs-ui-windows',
  			'oojs-ui.styles.icons-content',
  			'oojs-ui.styles.icons-editing-advanced',
+ 			'moment',
  			'mediawiki.Title',
  			'mediawiki.user',
  			'mediawiki.Upload',