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

Improve GUI (#1014)

Browse source
This commit is contained in:
RainLoop Team 2016-04-28 23:32:54 +03:00
parent b3299725f6
commit f64b63c549
16 changed files with 218 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/View/Popup/Compose.js
View file

@ -136,6 +136,10 @@
this.sendSuccessButSaveError = ko.observable(false);
this.savedError = ko.observable(false);
this.sendButtonSuccess = ko.computed(function () {
return !this.sendError() && !this.sendSuccessButSaveError();
}, this);
this.sendErrorDesc = ko.observable('');
this.savedErrorDesc = ko.observable('');

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

@ -60,6 +60,21 @@
return Enums.Focused.FolderList === AppStore.focusedState();
});
this.isInboxStarred = ko.computed(function () {
return FolderStore.currentFolder() &&
FolderStore.currentFolder().isInbox() &&
'is:flagged' === MessageStore.messageListSearch()
;
});
this.displayNewText = ko.observable(false);
this.displayNewMessageText = ko.observable(false);
Globals.leftPanelWidth.subscribe(function(v){
this.displayNewText(170 < v && 230 >= v);
this.displayNewMessageText(230 < v);
}, this);
kn.constructorEnd(this);
}
@ -71,7 +86,44 @@
this.oContentVisible = $('.b-content', oDom);
this.oContentScrollable = $('.content', this.oContentVisible);
var self = this;
var
self = this,
fSelectFolder = function (oEvent, bStarred) {
oEvent.preventDefault();
if (bStarred)
{
oEvent.stopPropagation();
}
var
oFolder = ko.dataFor(this)
;
if (oFolder)
{
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
MessageStore.message(null);
}
if (oFolder.fullNameRaw === FolderStore.currentFolderFullNameRaw())
{
Cache.setFolderHash(oFolder.fullNameRaw, '');
}
if (bStarred)
{
kn.setHash(Links.mailBox(oFolder.fullNameHash, 1, 'is:flagged'));
}
else
{
kn.setHash(Links.mailBox(oFolder.fullNameHash));
}
}
}
;
oDom
.on('click', '.b-folders .e-item .e-link .e-collapsed-sign', function (oEvent) {
@ -91,28 +143,11 @@
oEvent.stopPropagation();
}
})
.on('click', '.b-folders .e-item .e-link.selectable .inbox-star-icon', function (oEvent) {
fSelectFolder.call(this, oEvent, !self.isInboxStarred());
})
.on('click', '.b-folders .e-item .e-link.selectable', function (oEvent) {
oEvent.preventDefault();
var
oFolder = ko.dataFor(this)
;
if (oFolder)
{
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
MessageStore.message(null);
}
if (oFolder.fullNameRaw === FolderStore.currentFolderFullNameRaw())
{
Cache.setFolderHash(oFolder.fullNameRaw, '');
}
kn.setHash(Links.mailBox(oFolder.fullNameHash));
}
fSelectFolder.call(this, oEvent, false);
})
;
@ -240,7 +275,6 @@
};
/**
*
* @param {FolderModel} oToFolder
* @param {{helper:jQuery}} oUi
*/