From d323e30a576e242538d4d1f1eed296490d3164b9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 9 Jul 2014 08:45:43 +0200
Subject: Revert "Fix bug where compose storage wasn't cleared on page unload
 (#1489818)"

This reverts commit 8437d76389773571ba61d1a50cecba6b72d701c6.
---
 CHANGELOG         | 1 -
 program/js/app.js | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index af925da7c..7553b68d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,7 +22,6 @@ CHANGELOG Roundcube Webmail
 - Fix Delete button state after deleting identity/response (#1489972)
 - Fix bug where contacts with no email address were listed on compose addressbook (#1489970)
 - Fix images import from various vCard formats (#1489977)
-- Fix bug where compose storage wasn't cleared on page unload (#1489818)
 
 RELEASE 1.0.1
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index aa781f557..25f7b1eee 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -590,6 +590,9 @@ function rcube_webmail()
     if (this.task == 'mail' && this.env.action == 'compose' && $.inArray(command, this.env.compose_commands) < 0 && !this.env.server_error) {
       if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
         return false;
+
+      // remove copy from local storage if compose screen is left intentionally
+      this.remove_compose_data(this.env.compose_id);
     }
 
     // process external commands
@@ -3676,11 +3679,6 @@ function rcube_webmail()
           ref.compose_type_activity_last = ref.compose_type_activity;
         }
       }, 5000);
-
-      // remove data from local storage if compose screen is left
-      $(window).unload(function() {
-        ref.remove_compose_data(ref.env.compose_id);
-      });
     }
 
     // Unlock interface now that saving is complete
-- 
cgit v1.2.3