LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Fix handling of collapsed/expanded accounts 

Fixed #4541
pull/246/head
Francis Lachapelle 2018-11-13 14:59:09 -05:00
parent 707220bed3
commit c1ed49d4ba
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -7,6 +7,7 @@ Enhancements
Bug fixes
- [sogo-tool] fixed "manage-acl unsubscribe" command (#4591)
- [web] fixed handling of collapsed/expanded mail accounts (#4541)
4.0.4 (2018-10-23)
------------------

2
UI/Templates/MailerUI/UIxMailMainFrame.wox
View File

@ -88,7 +88,7 @@
ng-show="account.$expanded"
ng-class="{ 'md-warn': account.$quota.percent > 70 }">{{account.$quota.description}}</div>
</div>
<md-virtual-repeat-container ng-class="{ 'md-flex': account.$expanded }">
<md-virtual-repeat-container class="md-flex">
<md-list>
<md-list-item
class="sg-mailbox-list-item md-clickable md-default-theme md-background md-hue-1"

5
UI/WebServerResources/js/Mailer/Account.service.js
View File

@ -98,7 +98,10 @@
* @returns the number of mailboxes in the account
*/
Account.prototype.getLength = function() {
return this.$flattenMailboxes().length;
if (this.$expanded)
return this.$flattenMailboxes().length;
else
return 0;
};
/**

11
UI/WebServerResources/js/Mailer/MailboxesController.js
View File

@ -6,8 +6,8 @@
/**
* @ngInject
*/
MailboxesController.$inject = ['$scope', '$state', '$transitions', '$timeout', '$window', '$mdMedia', '$mdSidenav', '$mdDialog', '$mdToast', 'sgConstant', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'sgHotkeys', 'Account', 'Mailbox', 'VirtualMailbox', 'User', 'Preferences', 'stateAccounts'];
function MailboxesController($scope, $state, $transitions, $timeout, $window, $mdMedia, $mdSidenav, $mdDialog, $mdToast, sgConstant, focus, encodeUriFilter, Dialog, Settings, sgHotkeys, Account, Mailbox, VirtualMailbox, User, Preferences, stateAccounts) {
MailboxesController.$inject = ['$scope', '$state', '$transitions', '$timeout', '$window', '$mdUtil', '$mdMedia', '$mdSidenav', '$mdDialog', '$mdToast', 'sgConstant', 'sgFocus', 'encodeUriFilter', 'Dialog', 'sgSettings', 'sgHotkeys', 'Account', 'Mailbox', 'VirtualMailbox', 'User', 'Preferences', 'stateAccounts'];
function MailboxesController($scope, $state, $transitions, $timeout, $window, $mdUtil, $mdMedia, $mdSidenav, $mdDialog, $mdToast, sgConstant, focus, encodeUriFilter, Dialog, Settings, sgHotkeys, Account, Mailbox, VirtualMailbox, User, Preferences, stateAccounts) {
var vm = this,
account,
mailbox,
@ -142,7 +142,12 @@
this.toggleAccountState = function (account) {
account.$expanded = !account.$expanded;
account.$flattenMailboxes({ reload: true, saveState: true });
if (!this.debounceSaveState) {
this.debounceSaveState = $mdUtil.debounce(function () {
account.$flattenMailboxes({ reload: true, saveState: true });
}, 1000);
}
this.debounceSaveState();
};
this.subscribe = function(account) {