(js) Improve confirm dialogs for deletions
parent
693f80dc9a
commit
37f4b11834
1
NEWS
1
NEWS
|
@ -7,6 +7,7 @@ Enhancements
|
||||||
- [web] don't offer forward/vacation options in filters if not enabled
|
- [web] don't offer forward/vacation options in filters if not enabled
|
||||||
- [web] mail filters are now sortable
|
- [web] mail filters are now sortable
|
||||||
- [web] now supports RFC6154 and NoInferiors IMAP flag
|
- [web] now supports RFC6154 and NoInferiors IMAP flag
|
||||||
|
- [web] improved confirm dialogs for deletions
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- [web] handle birthday dates before 1970
|
- [web] handle birthday dates before 1970
|
||||||
|
|
|
@ -89,7 +89,8 @@
|
||||||
|
|
||||||
function confirmDeleteSelectedCards() {
|
function confirmDeleteSelectedCards() {
|
||||||
Dialog.confirm(l('Warning'),
|
Dialog.confirm(l('Warning'),
|
||||||
l('Are you sure you want to delete the selected contacts?'))
|
l('Are you sure you want to delete the selected contacts?'),
|
||||||
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
// User confirmed the deletion
|
// User confirmed the deletion
|
||||||
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
|
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
|
||||||
|
|
|
@ -97,7 +97,8 @@
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Dialog.confirm(l('Warning'), l('Are you sure you want to delete the addressbook <em>%{0}</em>?',
|
Dialog.confirm(l('Warning'), l('Are you sure you want to delete the addressbook <em>%{0}</em>?',
|
||||||
vm.service.selectedFolder.name))
|
vm.service.selectedFolder.name),
|
||||||
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
return vm.service.selectedFolder.$delete();
|
return vm.service.selectedFolder.$delete();
|
||||||
})
|
})
|
||||||
|
|
|
@ -121,7 +121,7 @@
|
||||||
function confirmDelete(card) {
|
function confirmDelete(card) {
|
||||||
Dialog.confirm(l('Warning'),
|
Dialog.confirm(l('Warning'),
|
||||||
l('Are you sure you want to delete the card of %{0}?', card.$fullname()),
|
l('Are you sure you want to delete the card of %{0}?', card.$fullname()),
|
||||||
{ok: l('Yes'), cancel: l('No')})
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
// User confirmed the deletion
|
// User confirmed the deletion
|
||||||
card.$delete()
|
card.$delete()
|
||||||
|
|
|
@ -55,7 +55,8 @@
|
||||||
|
|
||||||
function confirmDeleteSelectedMessages() {
|
function confirmDeleteSelectedMessages() {
|
||||||
Dialog.confirm(l('Warning'),
|
Dialog.confirm(l('Warning'),
|
||||||
l('Are you sure you want to delete the selected messages?'))
|
l('Are you sure you want to delete the selected messages?'),
|
||||||
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
var deleteSelectedMessage = false;
|
var deleteSelectedMessage = false;
|
||||||
var selectedMessages = _.filter(vm.selectedFolder.$messages, function(message) {
|
var selectedMessages = _.filter(vm.selectedFolder.$messages, function(message) {
|
||||||
|
|
|
@ -76,7 +76,8 @@
|
||||||
|
|
||||||
function confirmDeleteSelectedComponents() {
|
function confirmDeleteSelectedComponents() {
|
||||||
Dialog.confirm(l('Warning'),
|
Dialog.confirm(l('Warning'),
|
||||||
l('Are you sure you want to delete the selected components?'))
|
l('Are you sure you want to delete the selected components?'),
|
||||||
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
// User confirmed the deletion
|
// User confirmed the deletion
|
||||||
var components = _.filter(Component['$' + vm.componentType], function(component) { return component.selected; });
|
var components = _.filter(Component['$' + vm.componentType], function(component) { return component.selected; });
|
||||||
|
|
|
@ -97,7 +97,8 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Dialog.confirm(l('Warning'), l('Are you sure you want to delete the calendar <em>%{0}</em>?', folder.name))
|
Dialog.confirm(l('Warning'), l('Are you sure you want to delete the calendar <em>%{0}</em>?', folder.name),
|
||||||
|
{ ok: l('Delete') })
|
||||||
.then(function() {
|
.then(function() {
|
||||||
folder.$delete()
|
folder.$delete()
|
||||||
.then(function() {
|
.then(function() {
|
||||||
|
|
Loading…
Reference in New Issue