diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js index e49ec2cfd..83f01735c 100644 --- a/UI/WebServerResources/js/Mailer/MailboxesController.js +++ b/UI/WebServerResources/js/Mailer/MailboxesController.js @@ -51,8 +51,6 @@ }); $rootScope.$on('resetMailAdvancedSearchPanel', function () { - vm.service.$virtualPath = false; - vm.service.$virtualMode = false; vm.reset(); }); }; diff --git a/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js b/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js index f72e6a917..940908b76 100644 --- a/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js +++ b/UI/WebServerResources/js/Mailer/sgMailboxListItem.directive.js @@ -84,15 +84,17 @@ this.selectFolder = function($event) { - $rootScope.$broadcast('resetMailAdvancedSearchPanel'); // Reset advanced search panel (broadcast event to MailboxesController) if (this.editMode || this.mailbox == Mailbox.selectedFolder || this.mailbox.isNoSelect()) return; this.mailbox.setHighlightWords([]); - if (Mailbox.selectedFolder) { + if (Mailbox.$virtualMode) { Mailbox.$virtualMode = false; + Mailbox.$virtualPath = false; Mailbox.selectedFolder.$reset({ filter: true }); } + $rootScope.$broadcast('resetMailAdvancedSearchPanel'); // Reset advanced search panel (broadcast event to MailboxesController) + this.accountController.selectFolder(this); if ($event) { $state.go('mail.account.mailbox', {