Merge "(bug 41722) Remove use of the Feedback tool for December release"

VisualEditor.i18n.php

@@ -8,8 +8,6 @@ $messages['en'] = array(
 	'visualeditor' => 'VisualEditor',
 	'visualeditor-desc' => 'Visual editor for MediaWiki',
 	'visualeditor-preference-enable' => 'Enable VisualEditor (main namespace only)',
-	'visualeditor-feedback-prompt' => 'Leave feedback',
-	'visualeditor-feedback-dialog-title' => 'Leave feedback about VisualEditor',
 	'visualeditor-notification-saved' => 'Your changes to $1 have been saved.',
 	'visualeditor-notification-created' => '$1 has been created.',
 	'visualeditor-ca-editsource' => 'Edit source',

VisualEditor.php

@@ -104,7 +104,6 @@ $wgResourceModules += array(
 		'dependencies' => array(
 			'ext.visualEditor.base',
 			'mediawiki.util',
-			'mediawiki.feedback',
 			'mediawiki.Uri',
 			'mediawiki.Title',
 			'jquery.placeholder',
@@ -129,8 +128,6 @@ $wgResourceModules += array(
 			'visualeditor-notification-created',
 			'visualeditor-ca-editsource',
 			'visualeditor-loadwarning',
-			'visualeditor-feedback-prompt',
-			'visualeditor-feedback-dialog-title',
 			'visualeditor-editsummary',
 		),
 	),

modules/ve/init/mw/styles/ve.init.mw.ViewPageTarget.css

@@ -31,25 +31,6 @@
 	float: right;
 }
 
-.ve-init-mw-viewPageTarget-toolbar-feedbackButton {
-	display: inline-block;
-	cursor: pointer;
-	vertical-align: top;
-	padding: 0.25em;
-	height: 1.5em;
-	margin-right: 0.25em;
-	border: solid 1px transparent;
-}
-
-.ve-init-mw-viewPageTarget-toolbar-feedbackButton a {
-	display: inline-block;
-	vertical-align: middle;
-	margin-left: 4px;
-	margin-right: 4px;
-	font-size: 0.8em;
-	line-height: 1.8em;
-}
-
 .ve-init-mw-viewPageTarget-toolbar-saveButton,
 .ve-init-mw-viewPageTarget-saveDialog-saveButton {
 	display: inline-block;

modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js

@@ -27,8 +27,6 @@ ve.init.mw.ViewPageTarget = function VeInitMwViewPageTarget() {
 	this.$spinner = $( '<div class="ve-init-mw-viewPageTarget-loadingSpinner"></div>' );
 	this.$toolbarSaveButton =
 		$( '<div class="ve-init-mw-viewPageTarget-toolbar-saveButton"></div>' );
-	this.$toolbarFeedbackButton =
-		$( '<div class="ve-init-mw-viewPageTarget-toolbar-feedbackButton"><a href="#"></a></div>' );
 	this.$saveDialog =
 		$( '<div class="ve-init-mw-viewPageTarget-saveDialog"></div>' );
 	this.$saveDialogSaveButton = null;
@@ -89,7 +87,6 @@ ve.init.mw.ViewPageTarget = function VeInitMwViewPageTarget() {
 		this.setupSectionEditLinks();
 		if ( this.isViewPage ) {
 			this.setupToolbarSaveButton();
-			this.setupToolbarFeedbackButton();
 			this.setupSaveDialog();
 			if ( currentUri.query.veaction === 'edit' ) {
 				this.activate();
@@ -206,7 +203,6 @@ ve.init.mw.ViewPageTarget.prototype.deactivate = function ( override ) {
 			this.restoreSiteNotice();
 			this.hideSpinner();
 			this.detachToolbarSaveButton();
-			this.detachToolbarFeedbackButton();
 			this.detachSaveDialog();
 			this.tearDownSurface();
 			this.showTableOfContents();
@@ -225,7 +221,6 @@ ve.init.mw.ViewPageTarget.prototype.onLoad = function ( dom ) {
 	this.edited = false;
 	this.setUpSurface( dom );
 	this.attachToolbarSaveButton();
-	this.attachToolbarFeedbackButton();
 	this.attachSaveDialog();
 	this.restoreScrollPosition();
 	this.restoreEditSection();
@@ -1121,48 +1116,6 @@ ve.init.mw.ViewPageTarget.prototype.onBeforeUnload = function () {
 	}
 };
 
-/**
- * Sets up the feedback button.
- *
- * @method
- */
-ve.init.mw.ViewPageTarget.prototype.setupToolbarFeedbackButton = function () {
-	var feedback = new mw.Feedback( {
-		'title': new mw.Title( 'VisualEditor/Feedback' ),
-		'dialogTitleMessageKey': 'visualeditor-feedback-dialog-title',
-		'bugsLink': new mw.Uri(
-			'https://bugzilla.wikimedia.org/enter_bug.cgi?product=VisualEditor'
-		),
-		'bugsListLink': new mw.Uri(
-			'https://bugzilla.wikimedia.org/buglist.cgi?query_format=advanced&resolution=---&' +
-				'resolution=LATER&resolution=DUPLICATE&product=VisualEditor'
-		)
-	} );
-	this.$toolbarFeedbackButton.find( 'a' )
-		.text( ve.msg( 'visualeditor-feedback-prompt' ) )
-		.click( function () {
-			feedback.launch();
-		} );
-};
-
-/**
- * Adds the feedback button to the user interface.
- *
- * @method
- */
-ve.init.mw.ViewPageTarget.prototype.attachToolbarFeedbackButton = function () {
-	$( '.ve-ui-toolbar .ve-ui-actions' ).prepend( this.$toolbarFeedbackButton );
-};
-
-/**
- * Removes the feedback button from the user interface.
- *
- * @method
- */
-ve.init.mw.ViewPageTarget.prototype.detachToolbarFeedbackButton = function () {
-	this.$toolbarFeedbackButton.detach();
-};
-
 /* Initialization */
 
 ve.init.mw.targets.push( new ve.init.mw.ViewPageTarget() );