From e0496fc01d779d55c88985c8865b2a9ff57445d7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 26 Sep 2014 18:07:52 -0400
Subject: [PATCH] Enable/disable siganture commands before exiting the function in new compose window (#1490074)
---
program/js/app.js | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index eb3ff67..9dca320 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3965,6 +3965,19 @@
if (!show_sig)
show_sig = this.env.show_sig;
+ var id = obj.options[obj.selectedIndex].value,
+ sig = this.env.identity,
+ delim = this.env.recipients_separator,
+ rx_delim = RegExp.escape(delim);
+
+ // enable manual signature insert
+ if (this.env.signatures && this.env.signatures[id]) {
+ this.enable_command('insert-sig', true);
+ this.env.compose_commands.push('insert-sig');
+ }
+ else
+ this.enable_command('insert-sig', false);
+
// first function execution
if (!this.env.identities_initialized) {
this.env.identities_initialized = true;
@@ -3973,11 +3986,6 @@
if (this.env.opened_extwin)
return;
}
-
- var id = obj.options[obj.selectedIndex].value,
- sig = this.env.identity,
- delim = this.env.recipients_separator,
- rx_delim = RegExp.escape(delim);
// update reply-to/bcc fields with addresses defined in identities
$.each(['replyto', 'bcc'], function() {
@@ -4011,14 +4019,6 @@
if (old_val || new_val)
input.val(input_val).change();
});
-
- // enable manual signature insert
- if (this.env.signatures && this.env.signatures[id]) {
- this.enable_command('insert-sig', true);
- this.env.compose_commands.push('insert-sig');
- }
- else
- this.enable_command('insert-sig', false);
this.editor.change_signature(id, show_sig);
this.env.identity = id;
--
Gitblit v1.9.1