Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +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)
{ {
if (oEvent.shiftKey) if (oEvent.shiftKey && !oEvent.ctrlKey && !oEvent.altKey)
{ {
bClick = false; bClick = false;
if ('' === this.sLastUid) if ('' === this.sLastUid)
@ -665,10 +665,16 @@ Selector.prototype.actionClick = function (oItem, oEvent)
this.focusedItem(oItem); this.focusedItem(oItem);
} }
else if (oEvent.ctrlKey) else if (oEvent.ctrlKey && !oEvent.shiftKey && !oEvent.altKey)
{ {
bClick = false; bClick = false;
this.focusedItem(oItem); this.focusedItem(oItem);
if (this.selectedItem() && oItem !== this.selectedItem())
{
this.selectedItem().checked(true);
}
oItem.checked(!oItem.checked()); 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) if (Utils.isUnd(bPreview) ? false : !!bPreview)
{ {
_.delay(function () { if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message())
if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message()) {
{ RL.historyBack();
RL.historyBack(); }
}
}, 5);
} }
else else
{ {

3
dev/Storages/WebMailData.js
View file

@ -264,7 +264,8 @@ function WebMailDataStorage()
this.message.focused(false); this.message.focused(false);
this.hideMessageBodies(); 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(); RL.historyBack();
} }

23
rainloop/v/0.0.0/static/js/app.js
View file

@ -4554,7 +4554,7 @@ Selector.prototype.actionClick = function (oItem, oEvent)
if (oEvent) if (oEvent)
{ {
if (oEvent.shiftKey) if (oEvent.shiftKey && !oEvent.ctrlKey && !oEvent.altKey)
{ {
bClick = false; bClick = false;
if ('' === this.sLastUid) if ('' === this.sLastUid)
@ -4567,10 +4567,16 @@ Selector.prototype.actionClick = function (oItem, oEvent)
this.focusedItem(oItem); this.focusedItem(oItem);
} }
else if (oEvent.ctrlKey) else if (oEvent.ctrlKey && !oEvent.shiftKey && !oEvent.altKey)
{ {
bClick = false; bClick = false;
this.focusedItem(oItem); this.focusedItem(oItem);
if (this.selectedItem() && oItem !== this.selectedItem())
{
this.selectedItem().checked(true);
}
oItem.checked(!oItem.checked()); oItem.checked(!oItem.checked());
} }
} }
@ -15034,7 +15040,8 @@ function WebMailDataStorage()
this.message.focused(false); this.message.focused(false);
this.hideMessageBodies(); 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(); RL.historyBack();
} }
@ -17652,12 +17659,10 @@ MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPrevie
{ {
if (Utils.isUnd(bPreview) ? false : !!bPreview) if (Utils.isUnd(bPreview) ? false : !!bPreview)
{ {
_.delay(function () { if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message())
if (Enums.Layout.NoPreview === RL.data().layout() && !RL.data().message()) {
{ RL.historyBack();
RL.historyBack(); }
}
}, 5);
} }
else else
{ {

6
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long