summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2012-04-07 18:42:05 +0000
committerthomascube <thomas@roundcube.net>2012-04-07 18:42:05 +0000
commit59c404de0b1dd1da38773b7617276bc81535443a (patch)
treef45abf3242f487b4e87c14dae5849c4c3a3f22ca
parentc73efcc7bb6e0980ecd6505970894c57162940ea (diff)
Corrently focus HTML editor to make cursor visible. Patch by JohnDoh (#1487073)
-rw-r--r--CHANGELOG2
-rw-r--r--program/include/main.inc2
-rw-r--r--program/js/editor.js2
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5808e73e7..6bdb8aa4a 100644
--- a/CHANGELOG
+++ b/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/program/include/main.inc b/program/include/main.inc
index 3489928cd..3f502753e 100644
--- a/program/include/main.inc
+++ b/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/program/js/editor.js b/program/js/editor.js
index ce3b38c0e..4adfe2b5d 100644
--- a/program/js/editor.js
+++ b/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();
}
}
}