From b72854593edbd260b0823473c40ff15f7a279194 Mon Sep 17 00:00:00 2001
From: Neil Kandalgaonkar <neilk@users.mediawiki.org>
Date: Tue, 13 Dec 2011 10:26:49 +0000
Subject: [PATCH] change args for feedback and api -- all optional, in array.

---
 resources/mediawiki/mediawiki.api.js      |  8 +++++-
 resources/mediawiki/mediawiki.feedback.js | 34 ++++++++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/resources/mediawiki/mediawiki.api.js b/resources/mediawiki/mediawiki.api.js
index e093b59aa8..eafee05a68 100644
--- a/resources/mediawiki/mediawiki.api.js
+++ b/resources/mediawiki/mediawiki.api.js
@@ -12,15 +12,21 @@
 	 *   can override the parameter defaults and ajax default options.
 	 *	XXX document!
 	 *  
+	 * TODO share api objects with exact same config.
+	 *
 	 * ajax options can also be overriden on every get() or post()
 	 * 
 	 * @param options {Mixed} can take many options, but must include at minimum the API url.
 	 */
 	mw.Api = function( options ) {
 
+		if ( options === undefined ) {
+			options = {};
+		}
+
 		// make sure we at least have a URL endpoint for the API
 		if ( options.url === undefined ) {
-			throw new Error( 'Configuration error - needs url property' );
+			options.url = mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/api' + mw.config.get( 'wgScriptExtension' );
 		}
 
 		this.url = options.url;
diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index 975d19f0b3..041cd915e0 100644
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -31,18 +31,32 @@
 
 	/**
 	 * Thingy for collecting user feedback on a wiki page
-	 * @param {mw.api}  api properly configured to talk to this wiki
-	 * @param {mw.Title} the title of the page where you collect feedback
-	 * @param {String} optional - message key for the title of the dialog box
+	 * @param {Array} options -- optional, all properties optional.
+	 *		api: {mw.Api} if omitted, will just create a standard API
+	 * 		title: {mw.Title} the title of the page where you collect feedback. Defaults to "Feedback".
+	 * 		dialogTitleMessageKey: {String} message key for the title of the dialog box
 	 */
-	mw.Feedback = function( api, feedbackTitle, dialogTitleMessageKey ) {
-		var _this = this;
-		this.api = api;
-		this.feedbackTitle = feedbackTitle;
-		this.dialogTitleMessageKey = dialogTitleMessageKey;
-		if ( this.dialogTitleMessageKey === undefined ) {
-			this.dialogTitleMessageKey = 'feedback-submit';
+	mw.Feedback = function( options ) {
+
+		if ( options === undefined ) {
+			options = {};
+		}
+
+		if ( options.api === undefined ) {
+			options.api = new mw.Api();
+		}
+
+		if ( options.title === undefined ) {
+			options.title = new mw.Title( 'Feedback' );
+		}
+
+		if ( options.dialogTitleMessageKey === undefined ) {
+			options.dialogTitleMessageKey = 'feedback-submit';
 		}
+
+		this.api = options.api;
+		this.feedbackTitle = options.title;
+		this.dialogTitleMessageKey = options.dialogTitleMessageKey;
 		this.setup();
 	};
 
-- 
2.20.1