Small fixes

This commit is contained in:
RainLoop Team 2014-01-22 22:55:17 +04:00
parent bd935eae32
commit 1623f515ff
10 changed files with 47 additions and 15 deletions

View file

@ -265,6 +265,16 @@ FolderModel.prototype.initComputed = function ()
'owner': this
});
this.hasUnreadMessages = ko.computed(function () {
return 0 < this.messageCountUnread();
}, this);
this.hasSubScribedUnreadMessagesSubfolders = ko.computed(function () {
return !!_.find(this.subFolders(), function (oFolder) {
return oFolder.hasUnreadMessages() || oFolder.hasSubScribedUnreadMessagesSubfolders();
});
}, this);
return this;
};

View file

@ -90,6 +90,10 @@
}
}
&.unread-sub {
font-weight: bold;
}
.e-collapsed-sign {
cursor: pointer;
width: 22px;

View file

@ -768,7 +768,7 @@ PopupsComposeViewModel.prototype.onShow = function (sType, oMessageOrArray, aToE
}
if (bSignatureToAll && '' !== sSignature &&
Enums.ComposeType.EditAsNew !== sComposeType)
Enums.ComposeType.EditAsNew !== sComposeType && Enums.ComposeType.Draft !== sComposeType)
{
sText = Utils.convertPlainTextToHtml(this.convertSignature(sSignature,
fEmailArrayToStringLineHelper(oMessage.from, true))) + '<br />' + sText;