Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / plugins / TinyMCE / js / plugins / fullscreen / editor_plugin_src.js

diff --git a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
index 7429fffc777e18f34c9efd87b2ece69ad9fd9fd9..3477c86c9bcc191b78838ac87c315d54dab21ec4 100644 (file)
--- a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/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
@@ -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
@@ -110,16 +118,19 @@
                                        });\r
 \r
                                        t.fullscreenEditor.render();\r
-                                       tinyMCE.add(t.fullscreenEditor);\r
 \r
                                        t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');\r
                                        t.fullscreenElement.update();\r
                                        //document.body.overflow = 'hidden';\r
 \r
                                        t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {\r
-                                               var vp = tinymce.DOM.getViewPort();\r
+                                               var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;\r
+\r
+                                               // Get outer/inner size to get a delta size that can be used to calc the new iframe size\r
+                                               outerSize = fed.dom.getSize(fed.getContainer().firstChild);\r
+                                               innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);\r
 \r
-                                               t.fullscreenEditor.theme.resizeTo(vp.w, vp.h);\r
+                                               fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);\r
                                        });\r
                                }\r
                        });\r