Skip to content
This repository has been archived by the owner on Nov 8, 2018. It is now read-only.

show total count for drafts folder #1396

Merged
merged 2 commits into from
Apr 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## 0.4.2
* Fix autocompletion (regression)
[#1394](https://github.com/owncloud/mail/pull/1394) @ChristophWurst
* Fix show total email count for drafts folder
[#1396](https://github.com/owncloud/mail/pull/1396) @tahaalibra

## 0.4.1
* Fix js error when adding attachments
Expand Down
8 changes: 4 additions & 4 deletions js/templates/folder.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
{{#if folders}}<button class="collapse"></button>{{/if}}
<a class="folder {{#if specialRole}} icon-{{specialRole}} svg{{/if}}">
{{name}}
{{#if unseen}}
<span class="utils">{{unseen}}</span>
{{#if count}}
<span class="utils">{{count}}</span>
{{/if}}
</a>
<ul>
Expand All @@ -23,8 +23,8 @@
<a class="folder
{{#if specialRole}} icon-{{specialRole}} svg{{/if}}">
{{name}}
{{#if unseen}}
<span class="utils">{{unseen}}</span>
{{#if count}}
<span class="utils">{{count}}</span>
{{/if}}
</a>
{{/each}}
Expand Down
11 changes: 11 additions & 0 deletions js/views/folder.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ define(function(require) {

return Backbone.Marionette.ItemView.extend({
template: Handlebars.compile(FolderTemplate),
templateHelpers: function() {
var count = null;
if (this.model.get('specialRole') === 'drafts') {
count = this.model.get('total');
} else {
count = this.model.get('unseen');
}
return {
count: count
};
},
events: {
'click .collapse': 'collapseFolder',
'click .folder': 'loadFolder'
Expand Down
3 changes: 3 additions & 0 deletions js/views/messagesitem.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ define(function(require) {
$('.tipsy').remove();

thisModel.get('flags').set('unseen', false);
var folder = require('state').currentFolder;
var count = folder.get('total');
folder.set('total', count - 1);

this.$el.addClass('transparency').slideUp(function() {
$('.tipsy').remove();
Expand Down
13 changes: 9 additions & 4 deletions js/views/navigation-accounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,16 @@ define(function(require) {
activeEmail = ' - ' + activeAccount.get('email');
}
var activeFolder = require('state').currentFolder;
var unread = activeFolder.unseen || activeFolder.get('unseen');
var name = activeFolder.name || activeFolder.get('name');
if (unread > 0) {
window.document.title = name + ' (' + unread + ')' +
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
var count = 0;
if (name === 'Drafts') {
count = activeFolder.total || activeFolder.get('total');
} else {
count = activeFolder.unseen || activeFolder.get('unseen');
}
if (count > 0) {
window.document.title = name + ' (' + count + ')' +
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
activeEmail + ' - Mail - ' + oc_defaults.title;
// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
} else {
Expand Down