mirror of
https://github.com/Foundry376/Mailspring.git
synced 2024-09-21 07:46:06 +08:00
Add a confirmation prompt when deleting folders and labels #1785
This commit is contained in:
parent
b0387da59c
commit
ef9ed3368f
|
@ -1,4 +1,5 @@
|
||||||
import _ from 'underscore';
|
import _ from 'underscore';
|
||||||
|
import { remote } from 'electron';
|
||||||
import _str from 'underscore.string';
|
import _str from 'underscore.string';
|
||||||
import { OutlineViewItem } from 'mailspring-component-kit';
|
import { OutlineViewItem } from 'mailspring-component-kit';
|
||||||
import {
|
import {
|
||||||
|
@ -9,6 +10,7 @@ import {
|
||||||
CategoryStore,
|
CategoryStore,
|
||||||
Actions,
|
Actions,
|
||||||
RegExpUtils,
|
RegExpUtils,
|
||||||
|
localized,
|
||||||
} from 'mailspring-exports';
|
} from 'mailspring-exports';
|
||||||
|
|
||||||
import * as SidebarActions from './sidebar-actions';
|
import * as SidebarActions from './sidebar-actions';
|
||||||
|
@ -42,7 +44,6 @@ const toggleItemCollapsed = function(item) {
|
||||||
};
|
};
|
||||||
|
|
||||||
const onDeleteItem = function(item) {
|
const onDeleteItem = function(item) {
|
||||||
// TODO Delete multiple categories at once
|
|
||||||
if (item.deleted === true) {
|
if (item.deleted === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -51,6 +52,20 @@ const onDeleteItem = function(item) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const chosen = remote.dialog.showMessageBox({
|
||||||
|
type: 'info',
|
||||||
|
message: localized('Are you sure?'),
|
||||||
|
detail: localized(
|
||||||
|
'Deleting folders and labels cannot be undone and it may take a few minutes for changes to sync to Mailspring.'
|
||||||
|
),
|
||||||
|
buttons: [localized('Delete'), localized('Cancel')],
|
||||||
|
defaultId: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (chosen !== 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Actions.queueTask(
|
Actions.queueTask(
|
||||||
new DestroyCategoryTask({
|
new DestroyCategoryTask({
|
||||||
path: category.path,
|
path: category.path,
|
||||||
|
@ -147,7 +162,9 @@ export default class SidebarItem {
|
||||||
|
|
||||||
// We can't inspect the drag payload until drop, so we use a dataTransfer
|
// We can't inspect the drag payload until drop, so we use a dataTransfer
|
||||||
// type to encode the account IDs of threads currently being dragged.
|
// type to encode the account IDs of threads currently being dragged.
|
||||||
const accountsType = event.dataTransfer.types.find(t => t.startsWith('mailspring-accounts='));
|
const accountsType = event.dataTransfer.types.find(t =>
|
||||||
|
t.startsWith('mailspring-accounts=')
|
||||||
|
);
|
||||||
const accountIds = (accountsType || '').replace('mailspring-accounts=', '').split(',');
|
const accountIds = (accountsType || '').replace('mailspring-accounts=', '').split(',');
|
||||||
return target.canReceiveThreadsFromAccountIds(accountIds);
|
return target.canReceiveThreadsFromAccountIds(accountIds);
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue