diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-11-06 17:52:41 -0500 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-11-06 17:52:41 -0500 |
| commit | b11ff06ff2e81c007ce68ed035431bea2455c7e7 (patch) | |
| tree | 4fa7562cd6ac5907f60b1ec4235d906be8d4b771 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js | |
| parent | 1101c234b508089cbf4cdb81758336d574f02576 (diff) | |
| download | elgg-b11ff06ff2e81c007ce68ed035431bea2455c7e7.tar.gz elgg-b11ff06ff2e81c007ce68ed035431bea2455c7e7.tar.bz2 | |
upgraded TinyMCE to 3.4.7
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js')
| -rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js index bee26e161..a3713b29e 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js @@ -593,7 +593,11 @@ if (evt.altKey) {
if (evt.keyCode === DOM_VK_F10) {
- window.focus();
+ // Make sure focus is given to toolbar in Safari.
+ // We can't do this in IE as it prevents giving focus to toolbar when editor is in a frame
+ if (tinymce.isWebKit) {
+ window.focus();
+ }
t.toolbarGroup.focus();
return Event.cancel(evt);
} else if (evt.keyCode === DOM_VK_F11) {
@@ -1221,7 +1225,7 @@ ed.windowManager.open({
url : this.url + '/charmap.htm',
width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
- height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
+ height : 260 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
inline : true
}, {
theme_url : this.url
|