From 65eb26d7ea3433042d531c6d01856766d3c52084 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 21 Jul 2017 10:55:31 +0200 Subject: [PATCH] Collaborative Editor: - Remove "Keep unsaved changes and close" option on close action - Fix some of phrases - Fix discard icon --- filemanager/js/collab.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/filemanager/js/collab.js b/filemanager/js/collab.js index 4173456602..3a26e66466 100644 --- a/filemanager/js/collab.js +++ b/filemanager/js/collab.js @@ -161,9 +161,8 @@ app.classes.filemanager = app.classes.filemanager.extend({ if (_isLastMember) { var buttons = [ - {"button_id": 3,"text": 'save and close', id: 'save', image: 'check' }, - {"button_id": 2,"text": 'keep unsaved changes and leave', id: 'leave', image: 'close' }, - {"button_id": 1,"text": 'discard all unsaved changes', id: 'discard', image: 'delete' }, + {"button_id": 2,"text": 'save and close', id: 'save', image: 'check' }, + {"button_id": 1,"text": 'discard unsaved changes', id: 'discard', image: 'discard' }, {"button_id": 0,"text": 'cancel', id: 'cancel', image: 'cancel', "default":true} ]; et2_dialog.show_dialog( @@ -176,9 +175,6 @@ app.classes.filemanager = app.classes.filemanager.extend({ leave(); }); break; - case 'leave': - leave(); - break; case 'discard': self.editor_discard(); break; @@ -186,7 +182,7 @@ app.classes.filemanager = app.classes.filemanager.extend({ } }, - egw.lang('You are the last one on this session. What would you like to do with all changes in this document?'), + egw.lang('You are the last one on this session. What would you like to do with all unsaved changes in this document?'), 'Closing session', null, buttons, @@ -558,7 +554,7 @@ app.classes.filemanager = app.classes.filemanager.extend({ { var self = this; var buttons = [ - {"button_id": 1,"text": 'discard', id: 'discard', image: 'check' }, + {"button_id": 1,"text": 'discard', id: 'discard', image: 'discard' }, {"button_id": 0,"text": 'cancel', id: 'cancel', image: 'cancel', "default":true} ]; et2_dialog.show_dialog( @@ -572,7 +568,7 @@ app.classes.filemanager = app.classes.filemanager.extend({ }).sendRequest(); } }, - egw.lang('You are about to discard all modifications applied to this document by you and other participants. Be aware this will affect all participants and their changes on this document too.'), + egw.lang('Are you sure that you want to discard all modifications applied to this document by you and other participants?'), 'Discard all changes', null, buttons,