Changeset 3594 in subversion

Timestamp:

May 5, 2010 3:14:53 PM (3 years ago)

Author:

alec

Message:

• Set focus to editor on reply in HTML mode (#1486632)
• Fix composing in HTML jumps cursor to body instead of recipients (#1486674)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (6 diffs)
• program/js/editor.js (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Set focus to editor on reply in HTML mode (#1486632)
+- Fix composing in HTML jumps cursor to body instead of recipients (#1486674)
 - Allow columns order change per user - drag&drop (#1485795)
 - Add References header in read receipt (#1486681)

trunk/roundcubemail/program/js/app.js

@@ -2622 +2622 @@
     else if (input_subject.val() == '')
       input_subject.focus();
-    else if (input_message && !html_mode)
+    else if (input_message)
       input_message.focus();
+
+    this.env.compose_focus_elem = document.activeElement;
 
     // get summary of all field values
@@ -2790 +2792 @@
       show_sig = this.env.show_sig;
 
-    var id = obj.options[obj.selectedIndex].value;
-    var input_message = $("[name='_message']");
-    var message = input_message.val();
-    var is_html = ($("input[name='_is_html']").val() == '1');
-    var sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
-    var sig, cursor_pos, p = -1;
+    var sig, cursor_pos, p = -1,
+      id = obj.options[obj.selectedIndex].value,
+      input_message = $("[name='_message']"),
+      message = input_message.val(),
+      is_html = ($("input[name='_is_html']").val() == '1'),
+      sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
 
     if (!this.env.identity)
@@ -2831 +2833 @@
             message = message.substring(0, p) + sig + message.substring(p, message.length);
             cursor_pos = p - 1;
-          } 
+          }
           else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
             message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
@@ -2839 +2841 @@
             cursor_pos = 0;
             message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
-          } 
+          }
         }
         else {
@@ -2856 +2858 @@
     }
     else if (show_sig && this.env.signatures) {  // html
-      var editor = tinyMCE.get(this.env.composebody);
-      var sigElem = editor.dom.get('_rc_sig');
+      var editor = tinyMCE.get(this.env.composebody),
+        sigElem = editor.dom.get('_rc_sig');
 
       // Append the signature as a div within the body
       if (!sigElem) {
-        var body = editor.getBody();
-        var doc = editor.getDoc();
+        var body = editor.getBody(),
+          doc = editor.getDoc();
 
         sigElem = doc.createElement('div');
@@ -2869 +2871 @@
         if (this.env.sig_above) {
           // if no existing sig and top posting then insert at caret pos
-          editor.getWin().focus(); // correct focus in IE
+          editor.getWin().focus(); // correct focus in IE & Chrome
 
           var node = editor.selection.getNode();

trunk/roundcubemail/program/js/editor.js

@@ -64 +64 @@
 function rcmail_editor_callback(editor)
 {
-  var input_from = rcube_find_object('_from');
-  if (input_from && input_from.type=='select-one')
-    rcmail.change_identity(input_from);
+  var editor, elem = rcube_find_object('_from');
+  if (elem && elem.type=='select-one')
+    rcmail.change_identity(elem);
   // set tabIndex
   rcmail_editor_tabindex();
+  // set focus to element that was focused before
+  if (elem = rcmail.env.compose_focus_elem) {
+    if (elem.id == rcmail.env.composebody && (editor = tinyMCE.get(rcmail.env.composebody)))
+      editor.getWin().focus();
+    else
+      elem.focus();
+  }
 }