Fix missing cursor in HTML editor on mail reply (#5969)

roundcube · Sep 29, 2017 · 398a43e · 398a43e
1 parent 0dc804a
commit 398a43e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where HTML messages could have been rendered empty on some systems (#5957)
 - Fix wording of "Mark previewed messages as read" to "Mark messages as read" (#5952)
 - Enigma: Fix decryption of messages encoded with non-ascii charset (#5962)
+- Fix missing cursor in HTML editor on mail reply (#5969)
 
 RELEASE 1.3.1
 -------------

diff --git a/program/js/app.js b/program/js/app.js
@@ -4234,9 +4234,7 @@ function rcube_webmail()
       elem = input_message;
 
     // focus first empty element (need to be visible on IE8)
-    $(elem).filter(':visible').focus();
-
-    this.env.compose_focus_elem = document.activeElement;
+    this.env.compose_focus_elem = $(elem).filter(':visible').focus().get(0);
 
     // get summary of all field values
     this.compose_field_hash(true);

diff --git a/program/js/editor.js b/program/js/editor.js
@@ -182,7 +182,7 @@ function rcube_text_editor(config, id)
         rcmail.change_identity(elem);
 
       // Focus previously focused element
-      if (fe && fe.id != this.id) {
+      if (fe && fe.id != this.id && fe.nodeName != 'BODY') {
         window.focus(); // for WebKit (#1486674)
         fe.focus();
         rcmail.env.compose_focus_elem = null;