Changeset 3447 in subversion

Timestamp:

Mar 31, 2010 3:37:43 AM (3 years ago)

Author:

alec

Message:

• Fix js error when switching editor mode (#1486593)

File:

• trunk/roundcubemail/program/js/editor.js (modified) (4 diffs)

trunk/roundcubemail/program/js/editor.js

@@ -56 +56 @@
       relative_urls : false,
       remove_script_host : false,
-      rc_client: rcmail,
+      rc_client : rcmail,
       oninit : 'rcmail_editor_callback'
     });
@@ -76 +76 @@
   if (rcmail.env.task == 'mail') {
     var editor = tinyMCE.get(rcmail.env.composebody);
-    var textarea = editor.getElement();
-    var node = editor.getContentAreaContainer().childNodes[0];
-    if (textarea && node)
-      node.tabIndex = textarea.tabIndex;
+    if (editor) {
+      var textarea = editor.getElement();
+      var node = editor.getContentAreaContainer().childNodes[0];
+      if (textarea && node)
+        node.tabIndex = textarea.tabIndex;
+    }
   }
 }
@@ -99 +101 @@
 
     rcmail.plain2html(composeElement.value, textAreaId);
-    tinyMCE.execCommand('mceAddControl', true, textAreaId);
-    rcmail_editor_tabindex();
+    tinyMCE.execCommand('mceToggleEditor', false, textAreaId);
+    // #1486593
+    setTimeout("rcmail_editor_tabindex();", 500);
     if (flagElement && (flag = rcube_find_object(flagElement)))
       flag.value = '1';
@@ -119 +122 @@
       }
 
-    tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
+    tinyMCE.execCommand('mceToggleEditor', false, textAreaId);
     rcmail.display_spellcheck_controls(true);
     if (flagElement && (flag = rcube_find_object(flagElement)))