From a2e09c950d8716346b151f7980df1b51ebfbdd78 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 15 Apr 2014 12:35:33 -0400
Subject: [PATCH] Use methods chaining, don't use deprecated row_init method
---
program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js | 139 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 32 deletions(-)
diff --git a/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index afa4f9b..bec886f 100644
--- a/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -11,29 +11,48 @@
(function() {
var DOM = tinymce.DOM;
+ // State Transfer function
+ var transferState = function(oldEditor, newEditor, bookmark) {
+ var transferColorButtonState = function(swapme) {
+ var c = oldEditor.controlManager.get(swapme);
+ var newC = newEditor.controlManager.get(swapme);
+
+ if (c && newC) {
+ newC.displayColor(c.value);
+ }
+
+ };
+
+ transferColorButtonState('forecolor');
+ transferColorButtonState('backcolor');
+ newEditor.setContent(oldEditor.getContent({format : 'raw'}), {format : 'raw'});
+ newEditor.selection.moveToBookmark(bookmark);
+
+ if (oldEditor.plugins.spellchecker && newEditor.plugins.spellchecker) {
+ newEditor.plugins.spellchecker.setLanguage(oldEditor.plugins.spellchecker.selectedLang);
+ }
+ };
+
tinymce.create('tinymce.plugins.FullScreenPlugin', {
init : function(ed, url) {
- var t = this, s = {}, vp, posCss;
-
- t.editor = ed;
+ var t = this, s = {}, de = DOM.doc.documentElement, vp, fullscreen_overflow, fullscreen_html_overflow, fullscreen_scrollx, fullscreen_scrolly, posCss, bookmark;
// Register commands
ed.addCommand('mceFullScreen', function() {
- var win, de = DOM.doc.documentElement;
+ var win, oed;
if (ed.getParam('fullscreen_is_enabled')) {
if (ed.getParam('fullscreen_new_window'))
- closeFullscreen(); // Call to close in new window
+ closeFullscreen(); // Call to close in fullscreen.htm
else {
DOM.win.setTimeout(function() {
- tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
- tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent());
- tinyMCE.remove(ed);
- DOM.remove('mce_fullscreen_container');
- de.style.overflow = ed.getParam('fullscreen_html_overflow');
- DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));
- DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));
- tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+ var fullscreenEditor = ed;
+
+ // find the editor that opened this one, execute restore function there
+ var originalEditor = tinyMCE.get(fullscreenEditor.getParam('fullscreen_editor_id'));
+ originalEditor.plugins.fullscreen.saveState(fullscreenEditor);
+
+ tinyMCE.remove(fullscreenEditor);
}, 10);
}
@@ -41,6 +60,9 @@
}
if (ed.getParam('fullscreen_new_window')) {
+ t.fullscreenSettings = {
+ bookmark: ed.selection.getBookmark()
+ };
win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
try {
win.resizeTo(screen.availWidth, screen.availHeight);
@@ -48,27 +70,26 @@
// Ignore
}
} else {
- tinyMCE.oldSettings = tinyMCE.settings; // Store old settings
- s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
- s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
+ fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
+ fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
vp = DOM.getViewPort();
- s.fullscreen_scrollx = vp.x;
- s.fullscreen_scrolly = vp.y;
+ fullscreen_scrollx = vp.x;
+ fullscreen_scrolly = vp.y;
// Fixes an Opera bug where the scrollbars doesn't reappear
- if (tinymce.isOpera && s.fullscreen_overflow == 'visible')
- s.fullscreen_overflow = 'auto';
+ if (tinymce.isOpera && fullscreen_overflow == 'visible')
+ fullscreen_overflow = 'auto';
// Fixes an IE bug where horizontal scrollbars would appear
- if (tinymce.isIE && s.fullscreen_overflow == 'scroll')
- s.fullscreen_overflow = 'auto';
+ if (tinymce.isIE && fullscreen_overflow == 'scroll')
+ fullscreen_overflow = 'auto';
// Fixes an IE bug where the scrollbars doesn't reappear
- if (tinymce.isIE && (s.fullscreen_html_overflow == 'visible' || s.fullscreen_html_overflow == 'scroll'))
- s.fullscreen_html_overflow = 'auto';
+ if (tinymce.isIE && (fullscreen_html_overflow == 'visible' || fullscreen_html_overflow == 'scroll'))
+ fullscreen_html_overflow = 'auto';
- if (s.fullscreen_overflow == '0px')
- s.fullscreen_overflow = '';
+ if (fullscreen_overflow == '0px')
+ fullscreen_overflow = '';
DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
de.style.overflow = 'hidden'; //Fix for IE6/7
@@ -79,13 +100,13 @@
vp.h -= 1;
// Use fixed position if it exists
- if (tinymce.isIE6)
+ if (tinymce.isIE6 || document.compatMode == 'BackCompat')
posCss = 'absolute;top:' + vp.y;
else
posCss = 'fixed;top:0';
n = DOM.add(DOM.doc.body, 'div', {
- id : 'mce_fullscreen_container',
+ id : 'mce_fullscreen_container',
style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
DOM.add(n, 'div', {id : 'mce_fullscreen'});
@@ -108,13 +129,21 @@
s[k] = v;
});
+ t.fullscreenSettings = {
+ bookmark: ed.selection.getBookmark(),
+ fullscreen_overflow: fullscreen_overflow,
+ fullscreen_html_overflow: fullscreen_html_overflow,
+ fullscreen_scrollx: fullscreen_scrollx,
+ fullscreen_scrolly: fullscreen_scrolly
+ };
+
if (s.theme_advanced_toolbar_location === 'external')
s.theme_advanced_toolbar_location = 'top';
+ tinyMCE.oldSettings = tinyMCE.settings; // Store old settings, the Editor constructor overwrites them
t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
t.fullscreenEditor.onInit.add(function() {
- t.fullscreenEditor.setContent(ed.getContent());
- t.fullscreenEditor.focus();
+ t.loadState(t.fullscreenEditor);
});
t.fullscreenEditor.render();
@@ -127,7 +156,7 @@
var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;
// Get outer/inner size to get a delta size that can be used to calc the new iframe size
- outerSize = fed.dom.getSize(fed.getContainer().firstChild);
+ outerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('table')[0]);
innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);
fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);
@@ -141,6 +170,52 @@
ed.onNodeChange.add(function(ed, cm) {
cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
});
+
+ // fullscreenEditor is a param here because in window mode we don't create it
+ t.loadState = function(fullscreenEditor) {
+ if (!(fullscreenEditor && t.fullscreenSettings)) {
+ throw "No fullscreen editor to load to";
+ }
+
+ transferState(ed, fullscreenEditor, t.fullscreenSettings.bookmark);
+ fullscreenEditor.focus();
+
+ };
+
+ // fullscreenEditor is a param here because in window mode we don't create it
+ t.saveState = function(fullscreenEditor) {
+ if (!(fullscreenEditor && t.fullscreenSettings)) {
+ throw "No fullscreen editor to restore from";
+ }
+ var settings = t.fullscreenSettings;
+
+ transferState(fullscreenEditor, ed, fullscreenEditor.selection.getBookmark());
+
+ // cleanup only required if window mode isn't used
+ if (!ed.getParam('fullscreen_new_window')) {
+ tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
+ delete t.resizeFunc;
+
+ DOM.remove('mce_fullscreen_container');
+
+ DOM.doc.documentElement.style.overflow = settings.fullscreen_html_overflow;
+ DOM.setStyle(DOM.doc.body, 'overflow', settings.fullscreen_overflow);
+ DOM.win.scrollTo(settings.fullscreen_scrollx, settings.fullscreen_scrolly);
+ }
+ tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+
+ // clear variables
+ delete tinyMCE.oldSettings;
+ delete t.fullscreenEditor;
+ delete t.fullscreenElement;
+ delete t.fullscreenSettings;
+
+ // allow the fullscreen editor to be removed before restoring focus and selection
+ DOM.win.setTimeout(function() {
+ ed.selection.moveToBookmark(bookmark);
+ ed.focus();
+ }, 10);
+ };
},
getInfo : function() {
@@ -156,4 +231,4 @@
// Register plugin
tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
-})();
\ No newline at end of file
+})();
--
Gitblit v1.9.1