summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js8
2 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e76a85ff5..aa22fb0e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -57,7 +57,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 c635f6002..31c23dd0e 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -655,6 +655,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);
}
this.last_command = command;
@@ -3800,11 +3803,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