diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox index 72c1ca12b..a78c9c46d 100644 --- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox +++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox @@ -163,10 +163,10 @@
+ ng-click="mailbox.toggleMessageSelection($event, currentMessage)">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 0ccdc80b8..2351d80bd 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -307,199 +307,193 @@
- -
- - + +
+ + +
+ search -
--> -
-
- -
-
- - search +
+ + + filter_list -
-
- - - filter_list - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sort - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - refresh + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sort -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + refresh +
-
- -
+ + + + +
+ + arrow_back + + +
+ + + select_all + + + delete + +
+ + + +
view_day @@ -529,21 +543,9 @@ label:aria-label="Month" href="#/calendar/month">view_module
-
-
- - arrow_back - - - - - select_all - - - delete - -
- + +
+
+ ng-click="list.toggleComponentSelection($event, event)">
- +

{{event.c_title}}

{{event.c_location}}

@@ -585,10 +589,12 @@ ng-repeat="task in list.component.$tasks" ng-click="list.openTask($event, task)">
+ ng-click="list.toggleComponentSelection($event, task)">
- +

{{task.c_title}}

diff --git a/UI/WebServerResources/js/Mailer/MailboxController.js b/UI/WebServerResources/js/Mailer/MailboxController.js index dbabdf1fa..0011ccca0 100644 --- a/UI/WebServerResources/js/Mailer/MailboxController.js +++ b/UI/WebServerResources/js/Mailer/MailboxController.js @@ -17,6 +17,7 @@ vm.account = stateAccount; vm.selectedFolder = stateMailbox; vm.selectMessage = selectMessage; + vm.toggleMessageSelection = toggleMessageSelection; vm.unselectMessages = unselectMessages; vm.confirmDeleteSelectedMessages = confirmDeleteSelectedMessages; vm.copySelectedMessages = copySelectedMessages; @@ -35,6 +36,12 @@ $state.go('mail.account.mailbox.message', {accountId: stateAccount.id, mailboxId: encodeUriFilter(stateMailbox.path), messageId: message.uid}); } + function toggleMessageSelection($event, message) { + message.selected = !message.selected; + $event.preventDefault(); + $event.stopPropagation(); + } + function unselectMessages() { _.each(vm.selectedFolder.$messages, function(message) { message.selected = false; }); } @@ -154,7 +161,7 @@ } angular - .module('SOGo.MailerUI') - .controller('MailboxController', MailboxController); + .module('SOGo.MailerUI') + .controller('MailboxController', MailboxController); })(); diff --git a/UI/WebServerResources/js/Scheduler/CalendarListController.js b/UI/WebServerResources/js/Scheduler/CalendarListController.js index f3b5545b7..25031f680 100644 --- a/UI/WebServerResources/js/Scheduler/CalendarListController.js +++ b/UI/WebServerResources/js/Scheduler/CalendarListController.js @@ -6,8 +6,8 @@ /** * @ngInject */ - CalendarListController.$inject = ['$scope', '$timeout', '$state', '$mdDialog', 'encodeUriFilter', 'Dialog', 'Preferences', 'Calendar', 'Component']; - function CalendarListController($scope, $timeout, $state, $mdDialog, encodeUriFilter, Dialog, Preferences, Calendar, Component) { + CalendarListController.$inject = ['$scope', '$timeout', '$state', '$mdDialog', 'Dialog', 'Preferences', 'Calendar', 'Component']; + function CalendarListController($scope, $timeout, $state, $mdDialog, Dialog, Preferences, Calendar, Component) { var vm = this; vm.component = Component; @@ -16,6 +16,7 @@ vm.selectComponentType = selectComponentType; vm.unselectComponents = unselectComponents; vm.selectAll = selectAll; + vm.toggleComponentSelection = toggleComponentSelection; vm.confirmDeleteSelectedComponents = confirmDeleteSelectedComponents; vm.openEvent = openEvent; vm.openTask = openTask; @@ -64,6 +65,12 @@ }); } + function toggleComponentSelection($event, component) { + component.selected = !component.selected; + $event.preventDefault(); + $event.stopPropagation(); + } + function confirmDeleteSelectedComponents() { Dialog.confirm(l('Warning'), l('Are you sure you want to delete the selected components?')) diff --git a/UI/WebServerResources/js/Scheduler/Component.service.js b/UI/WebServerResources/js/Scheduler/Component.service.js index 32d72b455..9593cca1e 100644 --- a/UI/WebServerResources/js/Scheduler/Component.service.js +++ b/UI/WebServerResources/js/Scheduler/Component.service.js @@ -101,7 +101,7 @@ count = (_.filter(Component.$events, function(event) { return event.selected; })).length; } if (Component.$tasks) { - count = (_.filter(Component.$tasks, function(event) { return event.selected; })).length; + count = (_.filter(Component.$tasks, function(task) { return task.selected; })).length; } return count; };