reverting tinymce changes, updating smarty to 3.1.19

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / fullscreen / fullscreen.htm

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
index baf028b79f7ff36c6c868526441593bc5cf0b9eb..ffe528e41737d68d98a4929c299dbe5e37920990 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
@@ -46,7 +46,7 @@
                settings['strict_loading_mode'] = true;\r
 \r
                settings.save_onsavecallback = function() {\r
-                       moveContent();\r
+                       window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});\r
                        window.opener.tinyMCE.get(oeID).execCommand('mceSave');\r
                        window.close();\r
                };\r
@@ -56,15 +56,11 @@
                }\r
 \r
                function moveContent() {\r
-                       // find the original editor, execute restore state in it's plugin instance\r
-                       window.opener.tinyMCE.get(oeID).plugins.fullscreen.saveState(tinyMCE.activeEditor);\r
-\r
-                       // prevent moveContent from being called twice - e.g. if the unloadHandler runs after moveContent()\r
-                       tinymce.dom.Event.remove(window, "beforeunload", unloadHandler);\r
+                       window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());\r
                }\r
 \r
                function closeFullscreen() {\r
-                       // moveContent() will be called by the unload handler\r
+                       moveContent();\r
                        window.close();\r
                }\r
 \r
@@ -82,20 +78,17 @@
                function render() {\r
                        var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;\r
 \r
+                       e.value = window.opener.tinyMCE.get(oeID).getContent();\r
+\r
                        vp = dom.getViewPort();\r
                        settings.width = vp.w;\r
                        settings.height = vp.h - 15;\r
 \r
-                       settings.oninit = function() {\r
-                               var ed = tinyMCE.activeEditor;\r
-                               window.opener.tinyMCE.get(oeID).plugins.fullscreen.loadState(ed);\r
-\r
-                               tinymce.dom.Event.add(window, 'resize', function() {\r
-                                       var vp = dom.getViewPort();\r
+                       tinymce.dom.Event.add(window, 'resize', function() {\r
+                               var vp = dom.getViewPort();\r
 \r
-                                       tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);\r
-                               });\r
-                       }\r
+                               tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);\r
+                       });\r
 \r
                        tinyMCE.init(settings);\r
                }\r