From b11ff06ff2e81c007ce68ed035431bea2455c7e7 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 6 Nov 2011 17:52:41 -0500 Subject: upgraded TinyMCE to 3.4.7 --- .../jscripts/tiny_mce/themes/advanced/editor_template_src.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js') 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 -- cgit v1.2.3