Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2016-12-15 00:56:17 +03:00
parent d3f8fa4308
commit 0e9cffd657
10 changed files with 150 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dev/View/User/Login.js
View file

@ -171,27 +171,31 @@ class LoginUserView extends AbstractViewNext
}
}
windowOpenFeatures(wh) {
return `left=200,top=100,width=${wh},height=${wh},menubar=no,status=no,resizable=yes,scrollbars=yes`;
}
@command((self) => !self.submitRequest() && self.facebookLoginEnabled())
facebookCommand() {
window.open(socialFacebook(), 'Facebook', 'left=200,top=100,width=500,height=500,menubar=no,status=no,resizable=yes,scrollbars=yes');
window.open(socialFacebook(), 'Facebook', this.windowOpenFeatures(500));
return true;
}
@command((self) => !self.submitRequest() && self.googleLoginEnabled())
googleCommand() {
window.open(socialGoogle(), 'Google', 'left=200,top=100,width=550,height=550,menubar=no,status=no,resizable=yes,scrollbars=yes');
window.open(socialGoogle(), 'Google', this.windowOpenFeatures(550));
return true;
}
@command((self) => !self.submitRequest() && self.googleFastLoginEnabled())
googleFastCommand() {
window.open(socialGoogle(true), 'Google', 'left=200,top=100,width=550,height=550,menubar=no,status=no,resizable=yes,scrollbars=yes');
window.open(socialGoogle(true), 'Google', this.windowOpenFeatures(550));
return true;
}
@command((self) => !self.submitRequest() && self.twitterLoginEnabled())
twitterCommand() {
window.open(socialTwitter(), 'Twitter', 'left=200,top=100,width=500,height=500,menubar=no,status=no,resizable=yes,scrollbars=yes');
window.open(socialTwitter(), 'Twitter', this.windowOpenFeatures(500));
return true;
}

80
dev/View/User/MailBox/MessageList.js
View file

@ -513,23 +513,26 @@ class MessageListMailBoxUserView extends AbstractViewNext
/**
* @param {string} sFolderFullNameRaw
* @param {string|bool} mUid
* @param {number} iSetAction
* @param {Array=} aMessages = null
* @returns {void}
*/
setAction(sFolderFullNameRaw, mUid, iSetAction, aMessages) {
getApp().messageListAction(sFolderFullNameRaw, mUid, iSetAction, aMessages);
setAction(sFolderFullNameRaw, iSetAction, aMessages) {
getApp().messageListAction(sFolderFullNameRaw, iSetAction, aMessages);
}
/**
* @param {string} sFolderFullNameRaw
* @param {number} iSetAction
* @param {string} sThreadUid = ''
* @returns {void}
*/
setActionForAll(sFolderFullNameRaw, iSetAction) {
setActionForAll(sFolderFullNameRaw, iSetAction, sThreadUid = '') {
if ('' !== sFolderFullNameRaw)
{
let cnt = 0;
const uids = [];
let folder = getFolderFromCacheList(sFolderFullNameRaw);
if (folder)
{
@ -540,27 +543,64 @@ class MessageListMailBoxUserView extends AbstractViewNext
if (folder)
{
_.each(MessageStore.messageList(), (message) => {
if (message.unseen())
{
cnt++;
}
message.unseen(false);
uids.push(message.uid);
});
folder.messageCountUnread(0);
if (sThreadUid)
{
folder.messageCountUnread(folder.messageCountUnread() - cnt);
if (0 > folder.messageCountUnread())
{
folder.messageCountUnread(0);
}
}
else
{
folder.messageCountUnread(0);
}
clearMessageFlagsFromCacheByFolder(sFolderFullNameRaw);
}
Remote.messageSetSeenToAll(noop, sFolderFullNameRaw, true);
Remote.messageSetSeenToAll(noop, sFolderFullNameRaw, true, sThreadUid ? uids : null);
break;
case MessageSetAction.UnsetSeen:
folder = getFolderFromCacheList(sFolderFullNameRaw);
if (folder)
{
_.each(MessageStore.messageList(), (message) => {
if (!message.unseen())
{
cnt++;
}
message.unseen(true);
uids.push(message.uid);
});
folder.messageCountUnread(folder.messageCountAll());
if (sThreadUid)
{
folder.messageCountUnread(folder.messageCountUnread() + cnt);
if (folder.messageCountAll() < folder.messageCountUnread())
{
folder.messageCountUnread(folder.messageCountAll());
}
}
else
{
folder.messageCountUnread(folder.messageCountAll());
}
clearMessageFlagsFromCacheByFolder(sFolderFullNameRaw);
}
Remote.messageSetSeenToAll(noop, sFolderFullNameRaw, false);
Remote.messageSetSeenToAll(noop, sFolderFullNameRaw, false, sThreadUid ? uids : null);
break;
// no default
}
@ -571,26 +611,26 @@ class MessageListMailBoxUserView extends AbstractViewNext
}
listSetSeen() {
this.setAction(FolderStore.currentFolderFullNameRaw(), true,
this.setAction(FolderStore.currentFolderFullNameRaw(),
MessageSetAction.SetSeen, MessageStore.messageListCheckedOrSelected());
}
listSetAllSeen() {
this.setActionForAll(FolderStore.currentFolderFullNameRaw(), MessageSetAction.SetSeen);
this.setActionForAll(FolderStore.currentFolderFullNameRaw(), MessageSetAction.SetSeen, this.messageListEndThreadUid());
}
listUnsetSeen() {
this.setAction(FolderStore.currentFolderFullNameRaw(), true,
this.setAction(FolderStore.currentFolderFullNameRaw(),
MessageSetAction.UnsetSeen, MessageStore.messageListCheckedOrSelected());
}
listSetFlags() {
this.setAction(FolderStore.currentFolderFullNameRaw(), true,
this.setAction(FolderStore.currentFolderFullNameRaw(),
MessageSetAction.SetFlag, MessageStore.messageListCheckedOrSelected());
}
listUnsetFlags() {
this.setAction(FolderStore.currentFolderFullNameRaw(), true,
this.setAction(FolderStore.currentFolderFullNameRaw(),
MessageSetAction.UnsetFlag, MessageStore.messageListCheckedOrSelected());
}
@ -601,12 +641,12 @@ class MessageListMailBoxUserView extends AbstractViewNext
const checkedUids = _.map(checked, (message) => message.uid);
if (0 < checkedUids.length && -1 < inArray(currentMessage.uid, checkedUids))
{
this.setAction(currentMessage.folderFullNameRaw, true, currentMessage.flagged() ?
this.setAction(currentMessage.folderFullNameRaw, currentMessage.flagged() ?
MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, checked);
}
else
{
this.setAction(currentMessage.folderFullNameRaw, true, currentMessage.flagged() ?
this.setAction(currentMessage.folderFullNameRaw, currentMessage.flagged() ?
MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, [currentMessage]);
}
}
@ -619,12 +659,12 @@ class MessageListMailBoxUserView extends AbstractViewNext
if (isUnd(bFlag))
{
const flagged = _.filter(checked, (message) => message.flagged());
this.setAction(checked[0].folderFullNameRaw, true,
this.setAction(checked[0].folderFullNameRaw,
checked.length === flagged.length ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, checked);
}
else
{
this.setAction(checked[0].folderFullNameRaw, true,
this.setAction(checked[0].folderFullNameRaw,
!bFlag ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, checked);
}
}
@ -637,12 +677,12 @@ class MessageListMailBoxUserView extends AbstractViewNext
if (isUnd(seen))
{
const unseen = _.filter(checked, (message) => message.unseen());
this.setAction(checked[0].folderFullNameRaw, true,
this.setAction(checked[0].folderFullNameRaw,
0 < unseen.length ? MessageSetAction.SetSeen : MessageSetAction.UnsetSeen, checked);
}
else
{
this.setAction(checked[0].folderFullNameRaw, true,
this.setAction(checked[0].folderFullNameRaw,
seen ? MessageSetAction.SetSeen : MessageSetAction.UnsetSeen, checked);
}
}
@ -676,7 +716,7 @@ class MessageListMailBoxUserView extends AbstractViewNext
clearListIsVisible() {
return '' === this.messageListSearchDesc() && '' === this.messageListError() &&
'' === MessageStore.messageListEndThreadUid() &&
'' === this.messageListEndThreadUid() &&
0 < this.messageList().length && (this.isSpamFolder() || this.isTrashFolder());
}

5
dev/View/User/MailBox/MessageView.js
View file

@ -687,7 +687,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext
const message = self.message();
if (message)
{
getApp().messageListAction(message.folderFullNameRaw, message.uid,
getApp().messageListAction(message.folderFullNameRaw,
message.flagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, [message]);
}
})
@ -695,8 +695,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext
const message = ko.dataFor(this); // eslint-disable-line no-invalid-this
if (message && message.folder && message.uid)
{
getApp().messageListAction(
message.folder, message.uid,
getApp().messageListAction(message.folder,
message.flagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, [message]);
}