From f259bb9c025658d88e2f2b044f807d9d49edf5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 1 Jul 2019 15:11:57 +0200 Subject: [PATCH] MWSaveDialog: Use close flag for close actions, move 'back' button When previewing/reviewing changes, the "Return to save form" button now replaces the "Resume editing" button in the top-left corner (and receives the 'back' flag). Effectively, you tap 'back' once to go back to the edit summary, and twice to go back to editing. This seems to me like a much more natural interaction than two separate buttons. Bug: T225021 Bug: T227049 Bug: T227857 Change-Id: Id27ccf06923c8aa86b1c1a9292bc43bb825ce6c8 --- modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js index b1cb83f216..df492010b4 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js @@ -63,8 +63,8 @@ ve.ui.MWSaveDialog.static.actions = [ }, { label: OO.ui.deferMsg( 'visualeditor-savedialog-label-resume-editing' ), - flags: [ 'safe', 'back' ], - modes: [ 'save', 'review', 'preview', 'conflict' ] + flags: [ 'safe', 'close' ], + modes: [ 'save', 'conflict' ] }, { action: 'review', @@ -79,6 +79,7 @@ ve.ui.MWSaveDialog.static.actions = [ { action: 'approve', label: OO.ui.deferMsg( 'visualeditor-savedialog-label-review-good' ), + flags: [ 'safe', 'back' ], modes: [ 'review', 'preview' ] }, {