From ffa1920122901782f68e6837cda2fff503d0db69 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 20 Jul 2016 11:07:57 -0400 Subject: [PATCH] (js) Reset multiple-selection mode after delete --- NEWS | 1 + UI/WebServerResources/js/Contacts/AddressBookController.js | 1 + UI/WebServerResources/js/Scheduler/CalendarListController.js | 1 + 3 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 2c72331c8..71d09700f 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ Enhancements Bug fixes - [web] fixed refresh of addressbook when deleting one or many cards + - [web] reset multiple-selection mode after deleting cards, events or tasks 3.1.4 (2016-07-12) ------------------ diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js index 0b3b1ff68..f5870df84 100644 --- a/UI/WebServerResources/js/Contacts/AddressBookController.js +++ b/UI/WebServerResources/js/Contacts/AddressBookController.js @@ -59,6 +59,7 @@ // User confirmed the deletion var selectedCards = _.filter(vm.selectedFolder.$cards, function(card) { return card.selected; }); vm.selectedFolder.$deleteCards(selectedCards).then(function() { + vm.mode.multiple = 0; if (!vm.selectedFolder.selectedCard) $state.go('app.addressbook'); }); diff --git a/UI/WebServerResources/js/Scheduler/CalendarListController.js b/UI/WebServerResources/js/Scheduler/CalendarListController.js index dc8d58067..21cab081b 100644 --- a/UI/WebServerResources/js/Scheduler/CalendarListController.js +++ b/UI/WebServerResources/js/Scheduler/CalendarListController.js @@ -90,6 +90,7 @@ return component.selected; }); Calendar.$deleteComponents(components).then(function() { + vm.mode.multiple = 0; $rootScope.$emit('calendars:list'); }); });