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

de lang fixes

Browse source 
# key shortcut for delete
Release commit
This commit is contained in:
RainLoop Team 2014-06-03 03:22:36 +04:00
parent fb18e4e799
commit 2842a93593
11 changed files with 372 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

45
dev/ViewModels/MailBoxFolderListViewModel.js
View file

@ -9,7 +9,10 @@ function MailBoxFolderListViewModel()
KnoinAbstractViewModel.call(this, 'Left', 'MailFolderList');
var oData = RL.data();
this.oContentVisible = null;
this.oContentScrollable = null;
this.messageList = oData.messageList;
this.folderList = oData.folderList;
this.folderListSystem = oData.folderListSystem;
@ -28,6 +31,9 @@ Utils.extendAsViewModel('MailBoxFolderListViewModel', MailBoxFolderListViewModel
MailBoxFolderListViewModel.prototype.onBuild = function (oDom)
{
this.oContentVisible = $('.b-content', oDom);
this.oContentScrollable = $('.content', this.oContentVisible);
var self = this;
oDom
@ -63,7 +69,7 @@ MailBoxFolderListViewModel.prototype.onBuild = function (oDom)
{
oData.message(null);
}
if (oFolder.fullNameRaw === oData.currentFolderFullNameRaw())
{
RL.cache().setFolderHash(oFolder.fullNameRaw, '');
@ -100,8 +106,9 @@ MailBoxFolderListViewModel.prototype.onBuild = function (oDom)
}
$items.eq(iIndex).addClass('focused');
self.scrollToFocused();
}
return false;
});
@ -164,6 +171,38 @@ MailBoxFolderListViewModel.prototype.messagesDropOut = function ()
window.clearTimeout(this.iDropOverTimer);
};
MailBoxFolderListViewModel.prototype.scrollToFocused = function ()
{
if (!this.oContentVisible || !this.oContentScrollable)
{
return false;
}
var
iOffset = 20,
oFocused = $('.e-item .e-link.focused', this.oContentScrollable),
oPos = oFocused.position(),
iVisibleHeight = this.oContentVisible.height(),
iFocusedHeight = oFocused.outerHeight()
;
if (oPos && (oPos.top < 0 || oPos.top + iFocusedHeight > iVisibleHeight))
{
if (oPos.top < 0)
{
this.oContentScrollable.scrollTop(this.oContentScrollable.scrollTop() + oPos.top - iOffset);
}
else
{
this.oContentScrollable.scrollTop(this.oContentScrollable.scrollTop() + oPos.top - iVisibleHeight + iFocusedHeight + iOffset);
}
return true;
}
return false;
};
/**
*
* @param {FolderModel} oToFolder

40
dev/ViewModels/MailBoxMessageListViewModel.js
View file

@ -24,7 +24,7 @@ function MailBoxMessageListViewModel()
this.messageListSearch = oData.messageListSearch;
this.messageListError = oData.messageListError;
this.folderMenuForMove = oData.folderMenuForMove;
this.useCheckboxesInList = oData.useCheckboxesInList;
this.mainMessageListSearch = oData.mainMessageListSearch;
@ -146,7 +146,7 @@ function MailBoxMessageListViewModel()
this.multyForwardCommand = Utils.createCommand(this, function () {
kn.showScreenPopup(PopupsComposeViewModel, [Enums.ComposeType.ForwardAsAttachment, RL.data().messageListCheckedOrSelected()]);
}, this.canBeMoved);
this.deleteWithoutMoveCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
RL.data().currentFolderFullNameRaw(),
@ -154,7 +154,7 @@ function MailBoxMessageListViewModel()
}, this.canBeMoved);
this.deleteCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
RL.deleteMessagesFromFolder(Enums.FolderType.Trash,
RL.data().currentFolderFullNameRaw(),
RL.data().messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
@ -164,7 +164,7 @@ function MailBoxMessageListViewModel()
RL.data().currentFolderFullNameRaw(),
RL.data().messageListCheckedOrSelectedUidsWithSubMails(), true);
}, this.canBeMoved);
this.spamCommand = Utils.createCommand(this, function () {
RL.deleteMessagesFromFolder(Enums.FolderType.Spam,
RL.data().currentFolderFullNameRaw(),
@ -185,9 +185,9 @@ function MailBoxMessageListViewModel()
RL.reloadMessageList(false, true);
}
});
this.quotaTooltip = _.bind(this.quotaTooltip, this);
this.selector = new Selector(this.messageList, this.currentMessage,
'.messageListItem .actionHandle', '.messageListItem.selected', '.messageListItem .checkboxMessage',
'.messageListItem.focused');
@ -298,7 +298,7 @@ MailBoxMessageListViewModel.prototype.dragAndDronHelper = function (oMessageList
_.defer(function () {
var aUids = RL.data().messageListCheckedOrSelectedUidsWithSubMails();
oEl.data('rl-uids', aUids);
oEl.find('.text').text('' + aUids.length);
});
@ -317,7 +317,7 @@ MailBoxMessageListViewModel.prototype.onMessageResponse = function (sResult, oDa
oRainLoopData.hideMessageBodies();
oRainLoopData.messageLoading(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
{
oRainLoopData.setMessage(oData, bCached);
@ -595,7 +595,7 @@ MailBoxMessageListViewModel.prototype.seenMessagesFast = function (bSeen)
MailBoxMessageListViewModel.prototype.onBuild = function (oDom)
{
var
var
self = this,
oData = RL.data()
;
@ -684,20 +684,14 @@ MailBoxMessageListViewModel.prototype.initShortcuts = function ()
return false;
});
// TODO // more toggle
// key('', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
// self.moreDropdownTrigger(true);
// return false;
// });
// archive (zip)
key('z', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
self.archiveCommand();
return false;
});
// delete
key('delete, shift+delete', Enums.KeyState.MessageList, function (event, handler) {
key('delete, shift+delete, shift+3', Enums.KeyState.MessageList, function (event, handler) {
if (event)
{
if (0 < RL.data().messageListCheckedOrSelected().length)
@ -807,7 +801,7 @@ MailBoxMessageListViewModel.prototype.prefetchNextTick = function ()
{
if (!this.bPrefetch && !ifvisible.now() && this.viewModelVisibility())
{
var
var
self = this,
oCache = RL.cache(),
oMessage = _.find(this.messageList(), function (oMessage) {
@ -815,17 +809,17 @@ MailBoxMessageListViewModel.prototype.prefetchNextTick = function ()
!oCache.hasRequestedMessage(oMessage.folderFullNameRaw, oMessage.uid);
})
;
if (oMessage)
{
this.bPrefetch = true;
RL.cache().addRequestedMessage(oMessage.folderFullNameRaw, oMessage.uid);
RL.remote().message(function (sResult, oData) {
var bNext = !!(Enums.StorageResultType.Success === sResult && oData && oData.Result);
_.delay(function () {
self.bPrefetch = false;
if (bNext)
@ -833,7 +827,7 @@ MailBoxMessageListViewModel.prototype.prefetchNextTick = function ()
self.prefetchNextTick();
}
}, 1000);
}, oMessage.folderFullNameRaw, oMessage.uid);
}
}