mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 07:35:55 +08:00
Small fixes
This commit is contained in:
parent
bd935eae32
commit
1623f515ff
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -90,6 +90,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
&.unread-sub {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.e-collapsed-sign {
|
||||
cursor: pointer;
|
||||
width: 22px;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "RainLoop",
|
||||
"title": "RainLoop Webmail",
|
||||
"version": "1.6.2",
|
||||
"release": "659",
|
||||
"release": "660",
|
||||
"description": "Simple, modern & fast web-based email client",
|
||||
"homepage": "http://rainloop.net",
|
||||
"main": "Gruntfile.js",
|
||||
|
|
|
@ -89,17 +89,22 @@
|
|||
}
|
||||
</script>
|
||||
<script type="text/javascript">
|
||||
function __showError() {
|
||||
var oR = document.getElementById('rl-loading'),
|
||||
oL = document.getElementById('rl-loading-error');
|
||||
|
||||
if (oR) {oR.style.display = 'none';}
|
||||
if (oL) {oL.style.display = 'block';}
|
||||
if (window.SimplePace) {window.SimplePace.set(100);}
|
||||
}
|
||||
if (window.__RLBOOT) {
|
||||
window.__RLBOOT(function (bV) {
|
||||
if (!bV) {
|
||||
var oR = document.getElementById('rl-loading'),
|
||||
oL = document.getElementById('rl-loading-error');
|
||||
|
||||
if (oR) {oR.style.display = 'none';}
|
||||
if (oL) {oL.style.display = 'block';}
|
||||
if (window.SimplePace) {window.SimplePace.set(100);}
|
||||
__showError();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
__showError();
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<a class="e-link" data-bind="droppable: function (oEvent, oUi) { $root.messagesDrop($data, oUi); },
|
||||
droppableOver: function (oEvent, oUi) { $root.messagesDropOver($data, oUi); },
|
||||
droppableOut: function (oEvent, oUi) { $root.messagesDropOut($data, oUi); },
|
||||
css: { 'selected': selected() && !isSystemFolder(), 'selectable': selectableForFolderList, 'hidden' : hidden, 'print-count': 0 < printableUnreadCount().length, 'system': isSystemFolder, 'anim-action-class': actionBlink }">
|
||||
css: { 'selected': selected() && !isSystemFolder(), 'selectable': selectableForFolderList, 'hidden' : hidden, 'print-count': hasUnreadMessages, 'unread-sub': hasSubScribedUnreadMessagesSubfolders, 'system': isSystemFolder, 'anim-action-class': actionBlink }">
|
||||
<span class="badge pull-right count" data-bind="text: printableUnreadCount"></span>
|
||||
<i data-bind="css: collapsedCss()"></i>
|
||||
<span class="name" data-bind="text: name"></span>
|
||||
|
|
|
@ -6358,6 +6358,9 @@ html.rl-no-preview-pane #rl-right .ui-resizable-handle {
|
|||
.b-folders .e-item .e-link.print-count .count {
|
||||
display: inline;
|
||||
}
|
||||
.b-folders .e-item .e-link.unread-sub {
|
||||
font-weight: bold;
|
||||
}
|
||||
.b-folders .e-item .e-link .e-collapsed-sign {
|
||||
cursor: pointer;
|
||||
width: 22px;
|
||||
|
|
2
rainloop/v/0.0.0/static/css/app.min.css
vendored
2
rainloop/v/0.0.0/static/css/app.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -7540,6 +7540,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;
|
||||
};
|
||||
|
||||
|
@ -8777,7 +8787,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;
|
||||
|
|
8
rainloop/v/0.0.0/static/js/app.min.js
vendored
8
rainloop/v/0.0.0/static/js/app.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue