self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-23 18:53:36 +02:00
Code Issues Releases Activity

Desktop: Resolves #1662: Set cancel as the default in dangerous operations (#1934)

Browse Source 
* set cancel as the  default in dangerous operations, rename buttons (delete, remove) and context menu (for tags)

fixes #1662 (partially, because I can't fix the upstream issue, unless we update Electron)

* add default value for buttonLabel
This commit is contained in:
Helmut K. C. Tessarek 2019-10-03 17:33:49 -04:00 committed by Laurent Cozic
parent 4a88343372
commit d7a50a1b48
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ElectronClient/app/gui/SideBar.jsx
View File

@ -267,9 +267,11 @@ class SideBarComponent extends React.Component {
if (!itemId || !itemType) throw new Error('No data on element'); if (!itemId || !itemType) throw new Error('No data on element');
let deleteMessage = ''; let deleteMessage = '';
let buttonLabel = _('Remove');
if (itemType === BaseModel.TYPE_FOLDER) { if (itemType === BaseModel.TYPE_FOLDER) {
const folder = await Folder.load(itemId); const folder = await Folder.load(itemId);
deleteMessage = _('Delete notebook "%s"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.', substrWithEllipsis(folder.title, 0, 32)); deleteMessage = _('Delete notebook "%s"?\n\nAll notes and sub-notebooks within this notebook will also be deleted.', substrWithEllipsis(folder.title, 0, 32));
buttonLabel = _('Delete');
} else if (itemType === BaseModel.TYPE_TAG) { } else if (itemType === BaseModel.TYPE_TAG) {
const tag = await Tag.load(itemId); const tag = await Tag.load(itemId);
deleteMessage = _('Remove tag "%s" from all notes?', substrWithEllipsis(tag.title, 0, 32)); deleteMessage = _('Remove tag "%s" from all notes?', substrWithEllipsis(tag.title, 0, 32));
@ -286,9 +288,12 @@ class SideBarComponent extends React.Component {
menu.append( menu.append(
new MenuItem({ new MenuItem({
label: _('Delete'), label: buttonLabel,
click: async () => { click: async () => {
const ok = bridge().showConfirmMessageBox(deleteMessage); const ok = bridge().showConfirmMessageBox(deleteMessage, {
buttons: [buttonLabel, _('Cancel')],
defaultId: 1,
});
if (!ok) return; if (!ok) return;
if (itemType === BaseModel.TYPE_FOLDER) { if (itemType === BaseModel.TYPE_FOLDER) {