From 762565ceea334faaa90ee11a412cf34b2785b1c3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 05 Nov 2012 12:36:36 -0500
Subject: [PATCH] Don't add signature (again) when opening compose view in a new window
---
program/js/app.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index d9801ff..7764c6c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3044,6 +3044,7 @@
// close compose step in opener
if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
setTimeout(function(){ opener.history.back(); }, 100);
+ this.env.opened_extwin = true;
}
// configure parallel autocompletion
@@ -3064,7 +3065,7 @@
this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
// add signature according to selected identity
// if we have HTML editor, signature is added in callback
- if (input_from.prop('type') == 'select-one') {
+ if (input_from.prop('type') == 'select-one' && !this.env.opened_extwin) {
this.change_identity(input_from[0]);
}
}
--
Gitblit v1.9.1