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

Small fixes

Browse source 
Utf8 clear supports icon unicode
This commit is contained in:
RainLoop Team 2015-02-25 19:29:34 +04:00
parent e6725198c4
commit 19f089d0bf
15 changed files with 141 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dev/View/Popup/Account.js
View file

@ -43,6 +43,7 @@
this.submitRequest = ko.observable(false);
this.submitError = ko.observable('');
this.submitErrorAdditional = ko.observable('');
this.emailFocus = ko.observable(false);
@ -61,21 +62,28 @@
Remote.accountSetup(_.bind(function (sResult, oData) {
this.submitRequest(false);
if (Enums.StorageResultType.Success === sResult && oData && 'AccountSetup' === oData.Action)
if (Enums.StorageResultType.Success === sResult && oData)
{
if (oData.Result)
{
require('App/User').accountsAndIdentities();
this.cancelCommand();
}
else if (oData.ErrorCode)
else
{
this.submitError(Translator.getNotification(oData.ErrorCode));
this.submitError(oData.ErrorCode ? Translator.getNotification(oData.ErrorCode) :
Translator.getNotification(Enums.Notification.UnknownError));
if (oData.ErrorMessageAdditional)
{
this.submitErrorAdditional(oData.ErrorMessageAdditional);
}
}
}
else
{
this.submitError(Translator.getNotification(Enums.Notification.UnknownError));
this.submitErrorAdditional('');
}
}, this), this.email(), this.password(), this.isNew());
@ -104,6 +112,7 @@
this.submitRequest(false);
this.submitError('');
this.submitErrorAdditional('');
};
AccountPopupView.prototype.onShow = function (oAccount)

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

@ -251,15 +251,9 @@
return oMessage ? oMessage.generateUid() : '';
});
MessageStore.messageListEndHash.subscribe(function () {
this.selector.scrollToTop();
}, this);
SettingsStore.layout.subscribe(function (mValue) {
this.selector.autoSelect(Enums.Layout.NoPreview !== mValue);
}, this);
SettingsStore.layout.valueHasMutated();
this.selector.on('onAutoSelect', _.bind(function () {
return this.useAutoSelect();
}, this));
Events
.sub('mailbox.message-list.selector.go-down', function () {
@ -270,6 +264,10 @@
}, this)
;
MessageStore.messageListEndHash.subscribe(function () {
this.selector.scrollToTop();
}, this);
kn.constructorEnd(this);
}
@ -281,6 +279,16 @@
*/
MessageListMailBoxUserView.prototype.emptySubjectValue = '';
MessageListMailBoxUserView.prototype.useAutoSelect = function ()
{
if (/is:unseen/.test(this.mainMessageListSearch()))
{
return false;
}
return Enums.Layout.NoPreview !== SettingsStore.layout();
};
MessageListMailBoxUserView.prototype.searchEnterAction = function ()
{
this.mainMessageListSearch(this.sLastSearchValue);
@ -721,6 +729,14 @@
return false;
});
key('enter', Enums.KeyState.MessageList, function () {
if (self.message() && self.useAutoSelect())
{
Events.pub('mailbox.message-view.toggle-full-screen');
return false;
}
});
// archive (zip)
key('z', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
self.archiveCommand();

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

@ -323,6 +323,10 @@
Events.pub('mailbox.message-list.selector.go-down');
});
Events.sub('mailbox.message-view.toggle-full-screen', function () {
this.toggleFullScreen();
}, this);
kn.constructorEnd(this);
}
@ -581,6 +585,11 @@
if (this.fullScreenMode())
{
this.fullScreenMode(false);
if (Enums.Layout.NoPreview !== this.layout())
{
this.message.focused(false);
}
}
else if (Enums.Layout.NoPreview === this.layout())
{
@ -610,14 +619,6 @@
return false;
});
key('enter', Enums.KeyState.MessageList, function () {
if (Enums.Layout.NoPreview !== self.layout() && self.message())
{
self.toggleFullScreen();
return false;
}
});
// reply
key('r', [Enums.KeyState.MessageList, Enums.KeyState.MessageView], function () {
if (MessageStore.message())