From 39d14ee22b128967ac0223a71099b7ce87b1e81e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 8 Jul 2013 10:53:06 +0200 Subject: Fix bug where signature wasn't changed on identity selection when editing a draft (#1489229) Conflicts: program/js/app.js --- program/js/app.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'program/js/app.js') diff --git a/program/js/app.js b/program/js/app.js index b949570f5..8e6a6fff3 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -3069,7 +3069,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' && !this.env.opened_extwin) { + if (input_from.prop('type') == 'select-one') { this.change_identity(input_from[0]); } } @@ -3400,6 +3400,15 @@ function rcube_webmail() if (!show_sig) show_sig = this.env.show_sig; + // first function execution + if (!this.env.identities_initialized) { + this.env.identities_initialized = true; + if (this.env.show_sig_later) + this.env.show_sig = true; + if (this.env.opened_extwin) + return; + } + var cursor_pos, p = -1, id = obj.options[obj.selectedIndex].value, input_message = $("[name='_message']"), -- cgit v1.2.3