Updated tiny-mce to most recent 3.4 version

[citadel.git] / webcit / tiny_mce / themes / advanced / editor_template_src.js

diff --git a/webcit/tiny_mce/themes/advanced/editor_template_src.js b/webcit/tiny_mce/themes/advanced/editor_template_src.js
index bee26e161025b55d7efa965e4dcf449c300f26f9..324e11d0453a69a45f9a0a23a89e0c636f737157 100644 (file)
--- a/webcit/tiny_mce/themes/advanced/editor_template_src.js
+++ b/webcit/tiny_mce/themes/advanced/editor_template_src.js
@@ -386,7 +386,7 @@
                                        return v == sv;\r
                                });\r
 \r
-                               if (cur && (cur.value.fontSize == v.fontSize || cur.value['class'] == v['class'])) {\r
+                               if (cur && (cur.value.fontSize == v.fontSize || cur.value['class'] && cur.value['class'] == v['class'])) {\r
                                        c.select(null);\r
                                }\r
 \r
@@ -593,7 +593,11 @@
 \r
                                if (evt.altKey) {\r
                                        if (evt.keyCode === DOM_VK_F10) {\r
-                                               window.focus();\r
+                                               // Make sure focus is given to toolbar in Safari.\r
+                                               // We can't do this in IE as it prevents giving focus to toolbar when editor is in a frame\r
+                                               if (tinymce.isWebKit) {\r
+                                                       window.focus();\r
+                                               }\r
                                                t.toolbarGroup.focus();\r
                                                return Event.cancel(evt);\r
                                        } else if (evt.keyCode === DOM_VK_F11) {\r
@@ -1221,7 +1225,7 @@
                        ed.windowManager.open({\r
                                url : this.url + '/charmap.htm',\r
                                width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),\r
-                               height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),\r
+                               height : 265 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),\r
                                inline : true\r
                        }, {\r
                                theme_url : this.url\r