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 optimizations

Browse source
This commit is contained in:
RainLoop Team 2014-04-10 20:03:07 +04:00
parent 83036c8341
commit cc9186377f
5 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dev/Common/Selector.js
View file

@ -652,7 +652,7 @@ Selector.prototype.actionClick = function (oItem, oEvent)
if (oEvent)
{
if (oEvent.shiftKey)
if (oEvent.shiftKey && !oEvent.ctrlKey && !oEvent.altKey)
{
bClick = false;
if ('' === this.sLastUid)
@ -665,10 +665,16 @@ Selector.prototype.actionClick = function (oItem, oEvent)
this.focusedItem(oItem);
}
else if (oEvent.ctrlKey)
else if (oEvent.ctrlKey && !oEvent.shiftKey && !oEvent.altKey)
{
bClick = false;
this.focusedItem(oItem);
if (this.selectedItem() && oItem !== this.selectedItem())
{
this.selectedItem().checked(true);
}
oItem.checked(!oItem.checked());
}
}

10
dev/Screens/MailBox.js
View file

@ -55,12 +55,10 @@ MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPrevie
{
if (Utils.isUnd(bPreview) ? false : !!bPreview)
{
_.delay(function () {
if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message())
{
RL.historyBack();
}
}, 5);
if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message())
{
RL.historyBack();
}
}
else
{

3
dev/Storages/WebMailData.js
View file

@ -264,7 +264,8 @@ function WebMailDataStorage()
this.message.focused(false);
this.hideMessageBodies();
if (Enums.Layout.NoPreview === RL.data().layout())
if (Enums.Layout.NoPreview === RL.data().layout() &&
-1 < window.location.hash.indexOf('message-preview'))
{
RL.historyBack();
}