diff options
| author | Bruno Wagner <bwgpro@gmail.com> | 2015-04-09 12:32:35 -0300 |
|---|---|---|
| committer | Bruno Wagner <bwgpro@gmail.com> | 2015-04-09 12:32:35 -0300 |
| commit | bd78f1ff44061b17b80fef270c814a6e353179ad (patch) | |
| tree | 3ea2ab281c99eb9a52a31b3c1f70ae7f3896e792 /web-ui/app/js | |
| parent | 9811ea77558277757335e8f81da8548cc517fe09 (diff) | |
| parent | d63d8b4059f662a4fe2da2f8aa4151e759d16fc1 (diff) | |
Merge pull request #367 from glauco/master
Issue #363 [Luiz, Glauco] Trash Icon is not appearing for mails in Inbox anymore
Diffstat (limited to 'web-ui/app/js')
| -rw-r--r-- | web-ui/app/js/mail_list/ui/mail_item_factory.js | 6 | ||||
| -rw-r--r-- | web-ui/app/js/views/templates.js | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/web-ui/app/js/mail_list/ui/mail_item_factory.js b/web-ui/app/js/mail_list/ui/mail_item_factory.js index 87a883b0..3c815401 100644 --- a/web-ui/app/js/mail_list/ui/mail_item_factory.js +++ b/web-ui/app/js/mail_list/ui/mail_item_factory.js @@ -26,12 +26,14 @@ define( var MAIL_ITEM_TYPE = { 'drafts': DraftItem, - 'sent': SentItem + 'sent': SentItem, + 'trash': GenericMailItem }; var TEMPLATE_TYPE = { 'drafts': 'draft', - 'sent': 'sent' + 'sent': 'sent', + 'trash': 'trash' }; var createAndAttach = function (nodeToAttachTo, mail, currentMailIdent, currentTag, isChecked) { diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js index 470c6e51..64e269ca 100644 --- a/web-ui/app/js/views/templates.js +++ b/web-ui/app/js/views/templates.js @@ -41,7 +41,8 @@ define(['hbs/templates'], function (templates) { fullView: window.Pixelated['app/templates/mails/full_view.hbs'], mailActions: window.Pixelated['app/templates/mails/mail_actions.hbs'], draft: window.Pixelated['app/templates/mails/draft.hbs'], - sent: window.Pixelated['app/templates/mails/sent.hbs'] + sent: window.Pixelated['app/templates/mails/sent.hbs'], + trash: window.Pixelated['app/templates/mails/trash.hbs'] }, mailActions: { actionsBox: window.Pixelated['app/templates/mail_actions/actions_box.hbs'], |