X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.feedback%2Ffeedback.js;h=306d93a7aa374190918660609f5db996d75d04d2;hb=0357a6d0f292b3eb50fed48b94a36741f9211a4b;hp=d1fb98bf3ac7ff1a69db51c5e73743157f43c529;hpb=62c6f40d73637c777a6bf14eaa4d1512e6663170;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.feedback/feedback.js b/resources/src/mediawiki.feedback/feedback.js
index d1fb98bf3a..306d93a7aa 100644
--- a/resources/src/mediawiki.feedback/feedback.js
+++ b/resources/src/mediawiki.feedback/feedback.js
@@ -230,9 +230,6 @@
 			padded: true
 		} );
 
-		this.$spinner = $( '<div>' )
-			.addClass( 'feedback-spinner' );
-
 		// Feedback form
 		this.feedbackMessageLabel = new OO.ui.LabelWidget( {
 			classes: [ 'mw-feedbackDialog-welcome-message' ]
@@ -328,7 +325,7 @@
 				}
 			}, this )
 			.next( function () {
-				var plainMsg, parsedMsg,
+				var $link,
 					settings = data.settings;
 				data.contents = data.contents || {};
 
@@ -340,7 +337,7 @@
 				this.messagePosterPromise = settings.messagePosterPromise;
 				this.setBugReportLink( settings.bugsTaskSubmissionLink );
 				this.feedbackPageTitle = settings.title;
-				this.feedbackPageName = settings.title.getNameText();
+				this.feedbackPageName = settings.title.getMainText();
 
 				// Useragent checkbox
 				if ( settings.useragentCheckbox.show ) {
@@ -350,23 +347,12 @@
 				this.useragentMandatory = settings.useragentCheckbox.mandatory;
 				this.useragentFieldLayout.toggle( settings.useragentCheckbox.show );
 
-				// HACK: Setting a link in the messages doesn't work. There is already a report
-				// about this, and the bug report offers a somewhat hacky work around that
-				// includes setting a separate message to be parsed.
-				// We want to make sure the user can configure both the title of the page and
-				// a separate url, so this must be allowed to parse correctly.
-				// See https://phabricator.wikimedia.org/T49395#490610
-				mw.messages.set( {
-					'feedback-dialog-temporary-message':
-						'<a href="' + this.feedbackPageUrl + '" target="_blank">' + this.feedbackPageName + '</a>'
-				} );
-				plainMsg = mw.message( 'feedback-dialog-temporary-message' ).plain();
-				mw.messages.set( { 'feedback-dialog-temporary-message-parsed': plainMsg } );
-				parsedMsg = mw.message( 'feedback-dialog-temporary-message-parsed' );
+				$link = $( '<a>' )
+					.attr( 'href', this.feedbackPageUrl )
+					.attr( 'target', '_blank' )
+					.text( this.feedbackPageName );
 				this.feedbackMessageLabel.setLabel(
-					// Double-parse
-					$( '<span>' )
-						.append( mw.message( 'feedback-dialog-intro', parsedMsg ).parse() )
+					mw.message( 'feedback-dialog-intro', $link ).parseDom()
 				);
 
 				this.validateFeedbackForm();