diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-05 18:36:36 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-05 18:36:36 +0100 |
| commit | 762565ceea334faaa90ee11a412cf34b2785b1c3 (patch) | |
| tree | 23597c3a8f183040f003149b0fd0741c60c623c6 /program/js | |
| parent | 7bf6d2f01e6b5a24669febae3464f074d8c59cb7 (diff) | |
Don't add signature (again) when opening compose view in a new window
Diffstat (limited to 'program/js')
| -rw-r--r-- | program/js/app.js | 3 | ||||
| -rw-r--r-- | program/js/editor.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js index d9801ffdc..7764c6c86 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -3044,6 +3044,7 @@ function rcube_webmail() // 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 @@ function rcube_webmail() 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]); } } diff --git a/program/js/editor.js b/program/js/editor.js index bc36e9a39..3782de869 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -80,7 +80,7 @@ function rcmail_editor_callback() if (rcmail.env.default_font) $(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font); - if (elem && elem.type == 'select-one') { + if (elem && elem.type == 'select-one' && !rcmail.env.opened_extwin) { rcmail.change_identity(elem); // Focus previously focused element if (fe && fe.id != rcmail.env.composebody) { |