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 fixes

Browse source
This commit is contained in:
RainLoop Team 2015-02-22 22:25:34 +04:00
parent 8be7e720f3
commit 13d4c769e2
5 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Model/Message.js
View file

@ -97,9 +97,6 @@
case 'certificate':
sClass = 'icon-file-certificate';
break;
// case 'pdf':
// sClass = 'icon-file-pdf';
// break;
}
}
return sClass;

15
dev/Stores/User/Message.js
View file

@ -33,7 +33,6 @@
function MessageUserStore()
{
this.staticMessage = new MessageModel();
this.staticMessageList = [];
this.messageList = ko.observableArray([]).extend({'rateLimit': 0});
@ -621,7 +620,6 @@
iOffset = 0,
aList = [],
iUtc = moment().unix(),
aStaticList = this.staticMessageList,
oJsonMessage = null,
oMessage = null,
oFolder = null,
@ -674,12 +672,7 @@
oJsonMessage = oData.Result['@Collection'][iIndex];
if (oJsonMessage && 'Object/Message' === oJsonMessage['@Object'])
{
oMessage = aStaticList[iIndex];
if (!oMessage || !oMessage.initByJson(oJsonMessage))
{
oMessage = MessageModel.newInstanceFromJson(oJsonMessage);
}
oMessage = MessageModel.newInstanceFromJson(oJsonMessage);
if (oMessage)
{
if (Cache.hasNewMessageAndRemoveFromCache(oMessage.folderFullNameRaw, oMessage.uid) && 5 >= iNewCount)
@ -699,6 +692,7 @@
Cache.storeMessageFlagsToCache(oMessage);
}
oMessage.lastInCollapsedThreadLoading(false);
oMessage.lastInCollapsedThread(mLastCollapsedThreadUids && -1 < Utils.inArray(Utils.pInt(oMessage.uid), mLastCollapsedThreadUids) ? true : false);
aList.push(oMessage);
@ -717,11 +711,6 @@
this.messageList(aList);
this.messageListIsNotCompleted(false);
if (aStaticList.length < aList.length)
{
this.staticMessageList = aList;
}
Cache.clearNewMessageCache();
if (oFolder && (bCached || bUnreadCountChange || SettingsStore.useThreads()))

37
dev/Styles/FolderList.less
View file

@ -144,35 +144,40 @@
.b-sub-folders .e-item .e-link {
padding-left: @subPadding * 1 + @folderItemPadding;
}
.b-sub-folders.unpaddig-folder .e-item .e-link {
padding-left: @folderItemPadding;
}
.b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 2 + @folderItemPadding;
}
.b-sub-folders.unpaddig-folder .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 1 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 3 + @folderItemPadding;
}
.b-sub-folders.unpaddig-folder .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 2 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 4 + @folderItemPadding;
}
.b-sub-folders.unpaddig-folder .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 3 + @folderItemPadding;
}
/**
/**/
&.single-root-inbox .i-am-inbox.e-link {
display: none;
display: none !important;
}
&.single-root-inbox .i-am-inbox-wrapper + .b-sub-folders .e-item .e-link {
padding-left: @folderItemPadding;
&.single-root-inbox .i-am-inbox-wrapper > .b-sub-folders {
max-height: none !important;
height: inherit !important;
display: block !important;
}
&.single-root-inbox .i-am-inbox-wrapper {
.b-sub-folders .e-item .e-link {
padding-left: @folderItemPadding;
}
.b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 1 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 2 + @folderItemPadding;
}
.b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
padding-left: @subPadding * 3 + @folderItemPadding;
}
}
/**/
}