Upgrade TinyMCE to v3.4.5

[citadel.git] / webcit / tiny_mce / plugins / fullscreen / editor_plugin_src.js

diff --git a/webcit/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/webcit/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index 0efd9bbe57e4148d7ff8cae7205956b2ef082513..afa4f9b46ebf2e5967ab236285792872ad6ab77b 100644 (file)
--- a/webcit/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -13,7 +13,7 @@
 \r
        tinymce.create('tinymce.plugins.FullScreenPlugin', {\r
                init : function(ed, url) {\r
-                       var t = this, s = {}, vp;\r
+                       var t = this, s = {}, vp, posCss;\r
 \r
                        t.editor = ed;\r
 \r
@@ -27,7 +27,7 @@
                                        else {\r
                                                DOM.win.setTimeout(function() {\r
                                                        tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);\r
-                                                       tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});\r
+                                                       tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent());\r
                                                        tinyMCE.remove(ed);\r
                                                        DOM.remove('mce_fullscreen_container');\r
                                                        de.style.overflow = ed.getParam('fullscreen_html_overflow');\r
@@ -78,7 +78,15 @@
                                        if (tinymce.isIE)\r
                                                vp.h -= 1;\r
 \r
-                                       n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});\r
+                                       // Use fixed position if it exists\r
+                                       if (tinymce.isIE6)\r
+                                               posCss = 'absolute;top:' + vp.y;\r
+                                       else\r
+                                               posCss = 'fixed;top:0';\r
+\r
+                                       n = DOM.add(DOM.doc.body, 'div', {\r
+                                               id : 'mce_fullscreen_container', \r
+                                               style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});\r
                                        DOM.add(n, 'div', {id : 'mce_fullscreen'});\r
 \r
                                        tinymce.each(ed.settings, function(v, n) {\r
@@ -92,7 +100,7 @@
                                        s.fullscreen_editor_id = ed.id;\r
                                        s.theme_advanced_resizing = false;\r
                                        s.save_onsavecallback = function() {\r
-                                               ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});\r
+                                               ed.setContent(tinyMCE.get(s.id).getContent());\r
                                                ed.execCommand('mceSave');\r
                                        };\r
 \r