the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: clicking star icon for flagged items in INBOX failed

Browse source
This commit is contained in:
djmaze 2021-08-09 14:22:57 +02:00
parent fd293b723b
commit 019de7de87
1 changed files with 32 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
dev/View/User/MailBox/FolderList.js
View file

@ -51,45 +51,7 @@ export class FolderListMailBoxUserView extends AbstractViewLeft {
onBuild(dom) {
const qs = s => dom.querySelector(s),
eqs = (ev, s) => ev.target.closestWithin(s, dom),
fSelectFolder = (el, event, starred) => {
const isMove = moveAction();
ThemeStore.isMobile() && leftPanelDisabled(true);
event.preventDefault();
if (starred) {
event.stopPropagation();
}
const folder = ko.dataFor(el);
if (folder) {
if (isMove) {
moveAction(false);
rl.app.moveMessagesToFolder(
FolderUserStore.currentFolderFullNameRaw(),
MessageUserStore.listCheckedOrSelectedUidsWithSubMails(),
folder.fullNameRaw,
event.ctrlKey
);
} else {
if (!SettingsUserStore.usePreviewPane()) {
MessageUserStore.message(null);
}
if (folder.fullNameRaw === FolderUserStore.currentFolderFullNameRaw()) {
setFolderHash(folder.fullNameRaw, '');
}
rl.route.setHash(starred
? mailBox(folder.fullNameHash, 1, 'is:flagged')
: mailBox(folder.fullNameHash)
);
}
AppUserStore.focusedState(Scope.MessageList);
}
};
eqs = (ev, s) => ev.target.closestWithin(s, dom);
this.oContentScrollable = qs('.b-content');
@ -108,11 +70,38 @@ export class FolderListMailBoxUserView extends AbstractViewLeft {
}
}
el = eqs(event, '.b-folders .e-item a.selectable .inbox-star-icon');
el && fSelectFolder(el, event, !this.isInboxStarred());
el = eqs(event, '.b-folders .e-item a.selectable');
el && fSelectFolder(el, event, false);
if (el) {
ThemeStore.isMobile() && leftPanelDisabled(true);
event.preventDefault();
const folder = ko.dataFor(el);
if (folder) {
if (moveAction()) {
moveAction(false);
rl.app.moveMessagesToFolder(
FolderUserStore.currentFolderFullNameRaw(),
MessageUserStore.listCheckedOrSelectedUidsWithSubMails(),
folder.fullNameRaw,
event.ctrlKey
);
} else {
if (!SettingsUserStore.usePreviewPane()) {
MessageUserStore.message(null);
}
if (folder.fullNameRaw === FolderUserStore.currentFolderFullNameRaw()) {
setFolderHash(folder.fullNameRaw, '');
}
rl.route.setHash((eqs(event, '.b-folders .e-item a.selectable .inbox-star-icon') && !this.isInboxStarred())
? mailBox(folder.fullNameHash, 1, 'is:flagged')
: mailBox(folder.fullNameHash)
);
}
AppUserStore.focusedState(Scope.MessageList);
}
}
});
shortcuts.add('arrowup,arrowdown', '', Scope.FolderList, event => {