From 1fa591ff17dff2c8875e322294c60c13782d22e5 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sat, 7 Apr 2012 18:42:05 +0000
Subject: Corrently focus HTML editor to make cursor visible. Patch by JohnDoh
 (#1487073)

git-svn-id: https://svn.roundcube.net/trunk@6050 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/CHANGELOG                | 2 ++
 roundcubemail/program/include/main.inc | 2 +-
 roundcubemail/program/js/editor.js     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 5808e73e7..6bdb8aa4a 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix invisible cursor when replying to a html message (#1487073)
+- Reset IP stored in session when destroying session data (#1488056)
 - Fix bug where memory_limit = -1 wasn't handled properly
 - Support LDAP RFC2256's country object class read/write (#1488123)
 - Upgraded to jQuery 1.7.2
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 3489928cd..3f502753e 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1377,7 +1377,7 @@ function rcube_html_editor($mode='')
         'skin_path'  => $RCMAIL->output->get_skin_path(),
         'spellcheck' => intval($RCMAIL->config->get('enable_spellcheck')),
         'spelldict'  => intval($RCMAIL->config->get('spellcheck_dictionary')),
-    ))), 'foot');
+    ))), 'docready');
 }
 
 
diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js
index ce3b38c0e..4adfe2b5d 100644
--- a/roundcubemail/program/js/editor.js
+++ b/roundcubemail/program/js/editor.js
@@ -107,7 +107,7 @@ function rcmail_editor_tabindex(focus)
       if (textarea && node)
         node.tabIndex = textarea.tabIndex;
       if (focus)
-        editor.getWin().focus();
+        editor.getBody().focus();
     }
   }
 }
-- 
cgit v1.2.3