Created a discard draft behaviour #512 w/ bwagner

If a draft was never saved before, and there wasn't
any change to save, we now discard it instead saving
and deleting it. This also lessens the calls to saveDraft
that was causing some draft duplication.

3 files changed, 4 insertions, 4 deletions

diff --git a/web-ui/app/js/mail_view/ui/compose_box.js b/web-ui/app/js/mail_view/ui/compose_box.js
index 92588310..dcc8fd76 100644
--- a/web-ui/app/js/mail_view/ui/compose_box.js
+++ b/web-ui/app/js/mail_view/ui/compose_box.js
@@ -67,13 +67,15 @@ define(
         }
       };
 
+      this.discardDraft = function () {
+        this.trigger(events.dispatchers.rightPane.openNoMessageSelected);
+      };
+
       this.after('initialize', function () {
         this.renderComposeBox();
 
         this.select('toBox').focus();
-        this.on(this.select('cancelButton'), 'click', this.showNoMessageSelected);
         this.on(document, events.mail.deleted, this.mailDeleted);
-
         this.on(document, events.mail.sent, this.showNoMessageSelected);
       });
     }
diff --git a/web-ui/app/js/mail_view/ui/draft_box.js b/web-ui/app/js/mail_view/ui/draft_box.js
index 8c2e15c7..e8dd10ea 100644
--- a/web-ui/app/js/mail_view/ui/draft_box.js
+++ b/web-ui/app/js/mail_view/ui/draft_box.js
@@ -72,7 +72,6 @@ define(
         this.select('bodyBox').focus();
         this.select('tipMsg').hide();
         this.enableAutoSave();
-        this.on(this.select('cancelButton'), 'click', this.showNoMessageSelected);
         this.on(this.select('closeMailButton'), 'click', this.showNoMessageSelected);
       };
 
diff --git a/web-ui/app/js/mail_view/ui/mail_view.js b/web-ui/app/js/mail_view/ui/mail_view.js
index 3c5b0ccc..01db6c4f 100644
--- a/web-ui/app/js/mail_view/ui/mail_view.js
+++ b/web-ui/app/js/mail_view/ui/mail_view.js
@@ -212,7 +212,6 @@ define(
         this.trigger(events.mail.want, {mail: this.attr.ident, caller: this});
       };
 
-
       this.after('initialize', function () {
         this.on(this, events.mail.here, this.displayMail);
         this.on(this, events.mail.notFound, this.openNoMessageSelectedPane);