summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-25 19:48:01 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-25 19:48:01 +0100
commit1f82e46502934b7e2c4b53b33dc5ebb67f8e39b0 (patch)
treeaa0fb7c73acf529654c35e1d69fb698d8db235bc
parentf603883d37e778c8413347d07bb12e4180570aeb (diff)
Fix saving draft just after entering compose window (#1489012)
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/app.js5
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 04ec31d47..9d7c0d75f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix saving draft just after entering compose window (#1489012)
- Call resize handler in intervals to prevent lags and double onresize calls in Chrome (#1489005)
- Fix javascript error in IE9 when loading form with placeholders into an iframe (#1489008)
- Fix handling of some conditional comment tags in HTML message (#1489004)
diff --git a/program/js/app.js b/program/js/app.js
index d194b7326..9e05233f1 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -985,8 +985,8 @@ function rcube_webmail()
// Reset the auto-save timer
clearTimeout(this.save_timer);
- // compose form did not change
- if (this.cmp_hash == this.compose_field_hash()) {
+ // compose form did not change (and draft wasn't saved already)
+ if (this.draft_saved && this.cmp_hash == this.compose_field_hash()) {
this.auto_save_start();
break;
}
@@ -3302,6 +3302,7 @@ function rcube_webmail()
this.set_draft_id = function(id)
{
+ this.draft_saved = id;
$("input[name='_draft_saveid']").val(id);
};