jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374636 )
Change subject: Add feedback link for visual diff inside save dialog
......................................................................
Add feedback link for visual diff inside save dialog
Bug: T170665
Change-Id: I0b09b1089c834a013ad5fee4ecdf75b483b56323
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
5 files changed, 35 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
Esanders: Looks good to me, but someone else must approve
Deskana: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 0d207a1..3665d86 100644
--- a/extension.json
+++ b/extension.json
@@ -1347,6 +1347,7 @@
"visualeditor-savedialog-label-review",
"visualeditor-savedialog-label-review-good",
"visualeditor-savedialog-label-save-short",
+
"visualeditor-savedialog-label-visual-diff-report",
"visualeditor-savedialog-label-warning",
"visualeditor-savedialog-review-nosummary",
"visualeditor-savedialog-review-visual",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 0248450..fb9af38 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -384,6 +384,7 @@
"visualeditor-savedialog-label-review": "Review your changes",
"visualeditor-savedialog-label-review-good": "Return to save form",
"visualeditor-savedialog-label-save-short": "Save",
+ "visualeditor-savedialog-label-visual-diff-report": "Report incorrect
display for this change",
"visualeditor-savedialog-label-warning": "Warning",
"visualeditor-savedialog-review-nosummary": "No edit summary",
"visualeditor-savedialog-review-visual": "Visual (beta)",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 3a4fde9..3012d58 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -397,6 +397,7 @@
"visualeditor-savedialog-label-review": "Label for button to go to the
review dialog to review the diff",
"visualeditor-savedialog-label-review-good": "Label for button to go
back to a page in order to save form",
"visualeditor-savedialog-label-save-short": "Short label text for save
button on private wikis for use on width-restricted devices like mobile phones.
This should be as short as possible.\n{{Identical|Save}}",
+ "visualeditor-savedialog-label-visual-diff-report": "Label for button
to report a problem with the visual diff",
"visualeditor-savedialog-label-warning": "Label in front of a save
dialog warning sentence, separated by
{{msg-mw|colon-separator}}.\n{{Identical|Warning}}",
"visualeditor-savedialog-review-nosummary": "Message shown when no edit
summary was provided.",
"visualeditor-savedialog-review-visual": "Label for button to select
visual diff mode, with a note that this mode is in beta.",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 925f637..f7d6708 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -50,6 +50,8 @@
ve.ui.MWSaveDialog.static.title =
OO.ui.deferMsg( 'visualeditor-savedialog-title-save' );
+ve.ui.MWSaveDialog.static.feedbackUrl =
'https://www.mediawiki.org/wiki/Talk:VisualEditor/Diffs';
+
ve.ui.MWSaveDialog.static.actions = [
{
action: 'save',
@@ -84,6 +86,16 @@
label: OO.ui.deferMsg(
'visualeditor-savedialog-label-resolve-conflict' ),
flags: [ 'primary', 'constructive' ],
modes: 'conflict'
+ },
+ {
+ action: 'report',
+ label: OO.ui.deferMsg(
'visualeditor-savedialog-label-visual-diff-report' ),
+ flags: [ 'progressive' ],
+ modes: 'review',
+ framed: false,
+ icon: 'feedback',
+ classes: [ 've-ui-mwSaveDialog-visualDiffFeedback' ],
+ href: ve.ui.MWSaveDialog.static.feedbackUrl
}
];
@@ -584,9 +596,9 @@
],
classes: [ 've-ui-mwSaveDialog-reviewMode' ]
} );
- this.reviewModeButtonSelect.connect( this, { select: 'updateReviewMode'
} );
// TODO: Make 'visual' the default
this.reviewModeButtonSelect.selectItemByData( 'source' );
+ this.reviewModeButtonSelect.connect( this, { select: 'updateReviewMode'
} );
this.$reviewEditSummary = $( '<span>' ).addClass(
've-ui-mwSaveDialog-summaryPreview' ).addClass( 'comment' );
this.$reviewActions = $( '<div>' ).addClass(
've-ui-mwSaveDialog-actions' );
@@ -649,9 +661,16 @@
ve.ui.MWSaveDialog.prototype.updateReviewMode = function () {
var dialog = this,
isVisual =
this.reviewModeButtonSelect.getSelectedItem().getData() === 'visual';
+
+ // Hack: cache report action so it is getable even when hidden (see
T174497)
+ if ( !this.report ) {
+ this.report = this.getActions().get( { actions: 'report' } )[ 0
];
+ }
+
this.$reviewVisualDiff.toggleClass( 'oo-ui-element-hidden', !isVisual );
this.$reviewWikitextDiff.toggleClass( 'oo-ui-element-hidden', isVisual
);
if ( isVisual ) {
+ this.report.toggle( true );
if ( !this.diffElement ) {
if ( !this.diffElementPromise ) {
this.diffElementPromise =
this.getDiffElementPromise().then( function ( diffElement ) {
@@ -663,6 +682,8 @@
return;
}
this.positionDiffElement();
+ } else {
+ this.report.toggle( false );
}
this.updateSize();
};
@@ -763,6 +784,7 @@
return ve.ui.MWSaveDialog.super.prototype.getTeardownProcess.call(
this, data )
.next( function () {
this.emit( 'close' );
+ this.report = null;
}, this );
};
@@ -788,6 +810,11 @@
this.swapPanel( 'save' );
}, this );
}
+ if ( action === 'report' ) {
+ return new OO.ui.Process( function () {
+ window.open( this.constructor.static.feedbackUrl,
'_new' );
+ }, this );
+ }
return ve.ui.MWSaveDialog.super.prototype.getActionProcess.call( this,
action );
};
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
index b262487..0458b2e 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
@@ -93,3 +93,7 @@
.ve-ui-saveDialog-captchaInput {
margin-top: 0.5em;
}
+
+.ve-ui-mwSaveDialog-visualDiffFeedback {
+ float: right;
+}
--
To view, visit https://gerrit.wikimedia.org/r/374636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b09b1089c834a013ad5fee4ecdf75b483b56323
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Deskana <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tchanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
