From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 19 Dec 2017 18:48:05 +0000 (+0100)
Subject: mw.Feedback: Remove weird unnecessary switch statements
X-Git-Tag: 1.31.0-rc.0~1161
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=2fb365e2e8ef5eb83399edffcba4ad5151118cd9

mw.Feedback: Remove weird unnecessary switch statements

They made sense prior to 7196fafcdcbe658caf9ffde508717714b9cf4510,
but no longer do since the success and error handling are in different
functions. I probably should have removed them in that commit.

Change-Id: I1167dc1b5a79eadfe607abfc73bd2f0e95194b78
---

diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js
index 2d55094fdb..bfd5c06045 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -83,8 +83,7 @@
 
 	/**
 	 * Respond to dialog submit event. If the information was
-	 * submitted, either successfully or with an error, open
-	 * a MessageDialog to thank the user.
+	 * submitted successfully, open a MessageDialog to thank the user.
 	 *
 	 * @param {string} [status] A status of the end of operation
 	 *  of the main feedback dialog. Empty if the dialog was
@@ -92,37 +91,36 @@
 	 *  to the external task reporting site.
 	 */
 	mw.Feedback.prototype.onDialogSubmit = function ( status ) {
-		var dialogConfig = {};
-		switch ( status ) {
-			case 'submitted':
-				dialogConfig = {
-					title: mw.msg( 'feedback-thanks-title' ),
-					message: $( '<span>' ).msg(
-						'feedback-thanks',
-						this.feedbackPageTitle.getNameText(),
-						$( '<a>' ).attr( {
-							target: '_blank',
-							href: this.feedbackPageTitle.getUrl()
-						} )
-					),
-					actions: [
-						{
-							action: 'accept',
-							label: mw.msg( 'feedback-close' ),
-							flags: 'primary'
-						}
-					]
-				};
-				break;
+		var dialogConfig;
+
+		if ( status !== 'submitted' ) {
+			return;
 		}
 
+		dialogConfig = {
+			title: mw.msg( 'feedback-thanks-title' ),
+			message: $( '<span>' ).msg(
+				'feedback-thanks',
+				this.feedbackPageTitle.getNameText(),
+				$( '<a>' ).attr( {
+					target: '_blank',
+					href: this.feedbackPageTitle.getUrl()
+				} )
+			),
+			actions: [
+				{
+					action: 'accept',
+					label: mw.msg( 'feedback-close' ),
+					flags: 'primary'
+				}
+			]
+		};
+
 		// Show the message dialog
-		if ( !$.isEmptyObject( dialogConfig ) ) {
-			this.constructor.static.windowManager.openWindow(
-				this.thankYouDialog,
-				dialogConfig
-			);
-		}
+		this.constructor.static.windowManager.openWindow(
+			this.thankYouDialog,
+			dialogConfig
+		);
 	};
 
 	/**
@@ -421,14 +419,8 @@
 	 * @return {OO.ui.Error}
 	 */
 	mw.Feedback.Dialog.prototype.getErrorMessage = function () {
-		switch ( this.status ) {
-			case 'error1':
-			case 'error2':
-			case 'error3':
-			case 'error4':
-				// Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
-				return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
-		}
+		// Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
+		return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
 	};
 
 	/**