From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 18 Aug 2015 16:14:23 +0000 (+0200)
Subject: mediawiki.Upload: Allow passing mw.Api objects, not just configs
X-Git-Tag: 1.31.0-rc.0~10328^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/fiche.php?a=commitdiff_plain;h=8f185f06e202f83bf0678893075c096261f28dbb;p=lhc%2Fweb%2Fwiklou.git

mediawiki.Upload: Allow passing mw.Api objects, not just configs

This way we'll be able to use a mw.ForeignApi here
(being introduced in Ic20b9682d28633baa87d22e6e9fb71ce507da58d).

Change-Id: Ie49d7dad5abfe567f9b9c7396f8e132875568fd3
---

diff --git a/resources/src/mediawiki/mediawiki.Upload.js b/resources/src/mediawiki/mediawiki.Upload.js
index 551aa9ddb8..58c66c1060 100644
--- a/resources/src/mediawiki/mediawiki.Upload.js
+++ b/resources/src/mediawiki/mediawiki.Upload.js
@@ -44,10 +44,11 @@
 	 *     } );
 	 *
 	 * @constructor
-	 * @param {Object} apiconfig Passed to the constructor of mw.Api.
+	 * @param {Object|mw.Api} [apiconfig] A mw.Api object (or subclass), or configuration
+	 *     to pass to the constructor of mw.Api.
 	 */
 	function Upload( apiconfig ) {
-		this.api = new mw.Api( apiconfig );
+		this.api = ( apiconfig instanceof mw.Api ) ? apiconfig : new mw.Api( apiconfig );
 
 		this.watchlist = false;
 		this.text = '';