diff options
| author | Rafael Lisboa <rafaelzlisboa@gmail.com> | 2015-04-27 12:35:02 -0300 |
|---|---|---|
| committer | Rafael Lisboa <rafaelzlisboa@gmail.com> | 2015-04-27 12:35:02 -0300 |
| commit | 9234ef399cac44dcdc8dab11c20dd162953e447c (patch) | |
| tree | bbc3c618a245b903f99c1c41fa726062ead55ebf /web-ui/app/js/page | |
| parent | 5cc53a2ac0b47a05423ed9e4a64e24a3a9994a58 (diff) | |
| parent | 6617b24ae00490cf86282147b732cfa31de127fb (diff) | |
Merge pull request #373 from roberto/master
Allow user to move emails from trash to inbox
Diffstat (limited to 'web-ui/app/js/page')
| -rw-r--r-- | web-ui/app/js/page/default.js | 3 | ||||
| -rw-r--r-- | web-ui/app/js/page/events.js | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js index bbff271f..1571202e 100644 --- a/web-ui/app/js/page/default.js +++ b/web-ui/app/js/page/default.js @@ -27,6 +27,7 @@ define( 'mail_view/data/mail_sender', 'services/mail_service', 'services/delete_service', + 'services/recover_service', 'tags/ui/tag_list', 'tags/data/tags', 'page/router', @@ -56,6 +57,7 @@ define( mailSender, mailService, deleteService, + recoverService, tagList, tags, router, @@ -89,6 +91,7 @@ define( mailService.attachTo(document); deleteService.attachTo(document); + recoverService.attachTo(document); tags.attachTo(document); tagList.attachTo('#tag-list'); diff --git a/web-ui/app/js/page/events.js b/web-ui/app/js/page/events.js index f1f426f7..cf1b29ad 100644 --- a/web-ui/app/js/page/events.js +++ b/web-ui/app/js/page/events.js @@ -55,6 +55,7 @@ define(function () { updateSelected: 'ui:mail:updateSelected', delete: 'ui:mail:delete', deleteMany: 'ui:mail:deleteMany', + recoverMany: 'ui:mail:recoverMany', wantChecked: 'ui:mail:wantChecked', hereChecked: 'ui:mail:hereChecked', checked: 'ui:mail:checked', @@ -108,6 +109,7 @@ define(function () { unread: 'mail:unread', delete: 'mail:delete', deleteMany: 'mail:deleteMany', + recoverMany: 'mail:recoverMany', deleted: 'mail:deleted', saveDraft: 'draft:save', draftSaved: 'draft:saved', |