diff --git a/NEWS b/NEWS index 606b8f8ac..591d70832 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ Enhancements - [web] don't offer forward/vacation options in filters if not enabled - [web] mail filters are now sortable - [web] now supports RFC6154 and NoInferiors IMAP flag + - [web] improved confirm dialogs for deletions Bug fixes - [web] handle birthday dates before 1970 diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js index e98b85d2a..6a9f7b051 100644 --- a/UI/WebServerResources/js/Contacts/AddressBookController.js +++ b/UI/WebServerResources/js/Contacts/AddressBookController.js @@ -89,7 +89,8 @@ function confirmDeleteSelectedCards() { 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() { // User confirmed the deletion var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; }); diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js index f3b8c792a..35c7e33be 100644 --- a/UI/WebServerResources/js/Contacts/AddressBooksController.js +++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js @@ -97,7 +97,8 @@ } else { Dialog.confirm(l('Warning'), l('Are you sure you want to delete the addressbook %{0}?', - vm.service.selectedFolder.name)) + vm.service.selectedFolder.name), + { ok: l('Delete') }) .then(function() { return vm.service.selectedFolder.$delete(); }) diff --git a/UI/WebServerResources/js/Contacts/CardController.js b/UI/WebServerResources/js/Contacts/CardController.js index 76850727c..6811d2c5a 100644 --- a/UI/WebServerResources/js/Contacts/CardController.js +++ b/UI/WebServerResources/js/Contacts/CardController.js @@ -121,7 +121,7 @@ function confirmDelete(card) { Dialog.confirm(l('Warning'), 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() { // User confirmed the deletion card.$delete() diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js index 7688bfe99..1642f8f8b 100644 --- a/UI/WebServerResources/js/Mailer/MailboxController.js +++ b/UI/WebServerResources/js/Mailer/MailboxController.js @@ -55,7 +55,8 @@ function confirmDeleteSelectedMessages() { 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() { var deleteSelectedMessage = false; var selectedMessages = _.filter(vm.selectedFolder.$messages, function(message) { diff --git a/UI/WebServerResources/js/Scheduler/CalendarListController.js b/UI/WebServerResources/js/Scheduler/CalendarListController.js index 5984fad52..2fcfbf4ac 100644 --- a/UI/WebServerResources/js/Scheduler/CalendarListController.js +++ b/UI/WebServerResources/js/Scheduler/CalendarListController.js @@ -76,7 +76,8 @@ function confirmDeleteSelectedComponents() { 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() { // User confirmed the deletion var components = _.filter(Component['$' + vm.componentType], function(component) { return component.selected; }); diff --git a/UI/WebServerResources/js/Scheduler/CalendarsController.js b/UI/WebServerResources/js/Scheduler/CalendarsController.js index 2813a4d20..b8349e469 100644 --- a/UI/WebServerResources/js/Scheduler/CalendarsController.js +++ b/UI/WebServerResources/js/Scheduler/CalendarsController.js @@ -97,7 +97,8 @@ }); } else { - Dialog.confirm(l('Warning'), l('Are you sure you want to delete the calendar %{0}?', folder.name)) + Dialog.confirm(l('Warning'), l('Are you sure you want to delete the calendar %{0}?', folder.name), + { ok: l('Delete') }) .then(function() { folder.$delete() .then(function() {