This commit is contained in:
webzwo0i 2021-02-28 16:45:51 +01:00
parent 73cbcc7d3c
commit 874f2ccc88

View file

@ -86,8 +86,6 @@ const Ace2Editor = function () {
this.exportText = () => loaded ? info.ace_exportText() : '(awaiting init)\n'; this.exportText = () => loaded ? info.ace_exportText() : '(awaiting init)\n';
this.getFrame = () => info.frame || null;
this.getDebugProperty = (prop) => info.ace_getDebugProperty(prop); this.getDebugProperty = (prop) => info.ace_getDebugProperty(prop);
this.getInInternationalComposition = this.getInInternationalComposition =
@ -176,44 +174,49 @@ const Ace2Editor = function () {
outerFrame.frameBorder = 0; // for IE outerFrame.frameBorder = 0; // for IE
outerFrame.title = 'Ether'; outerFrame.title = 'Ether';
info.frame = outerFrame; info.frame = outerFrame;
document.getElementById(containerId).appendChild(outerFrame);
const outerWindow = outerFrame.contentWindow; const postOuterFrame = () => {
const outerDocument = outerWindow.document; const outerWindow = outerFrame.contentWindow;
const skinVariants = clientVars.skinVariants.split(' ').filter((x) => x !== ''); const outerDocument = outerWindow.document;
outerDocument.documentElement.classList.add('inner-editor', 'outerdoc', ...skinVariants); const skinVariants = clientVars.skinVariants.split(' ').filter((x) => x !== '');
addStyleTagsFor(outerDocument, includedCSS); outerDocument.documentElement.classList.add('inner-editor', 'outerdoc', ...skinVariants);
addStyleTagsFor(outerDocument, includedCSS);
const style = outerDocument.createElement('style'); const styleO = outerDocument.createElement('style');
style.type = 'text/css'; styleO.type = 'text/css';
style.title = 'dynamicsyntax'; styleO.title = 'dynamicsyntax';
outerDocument.head.appendChild(style); outerDocument.head.appendChild(styleO);
const link = outerDocument.createElement('link'); const link = outerDocument.createElement('link');
link.rel = 'stylesheet'; link.rel = 'stylesheet';
link.type = 'text/css'; link.type = 'text/css';
link.href = 'data:text/css,'; link.href = 'data:text/css,';
outerDocument.head.appendChild(link); outerDocument.head.appendChild(link);
outerWindow.editorInfo = Ace2Editor.registry[info.id]; outerWindow.editorInfo = Ace2Editor.registry[info.id];
outerWindow.onload = () => { const postRequire = () => {
outerWindow.onload = null; const w = document.querySelectorAll('iframe[name=ace_outer]')[0].contentDocument
const window = outerWindow; .querySelectorAll('iframe[name=ace_inner]')[0].contentWindow;
const document = outerDocument; const require = w.require;
setTimeout(() => { require.setRootURI('../javascripts/src');
const iframe = document.createElement('iframe'); require.setLibraryURI('../javascripts/lib');
iframe.name = 'ace_inner'; require.setGlobalKeyPath('require');
iframe.title = 'pad';
iframe.scrolling = 'no'; w.plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
iframe.frameBorder = 0; w.plugins.adoptPluginsFromAncestorsOf(w);
iframe.allowTransparency = true; // for IE
iframe.ace_outerWin = window; w.jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery;
document.body.insertBefore(iframe, document.body.firstChild); w.$ = w.jQuery;
window.readyFunc = () => { w.Ace2Inner = require('ep_etherpad-lite/static/js/ace2_inner');
delete window.readyFunc;
window.editorInfo.onEditorReady(); w.plugins.ensure(() => w.Ace2Inner.init());
delete window.editorInfo; };
}; outerWindow.readyFunc = () => {
delete outerWindow.readyFunc;
outerWindow.editorInfo.onEditorReady();
delete outerWindow.editorInfo;
};
const postInnerFrame = () => {
const innerWindow = iframe.contentWindow; const innerWindow = iframe.contentWindow;
const innerDocument = innerWindow.document; const innerDocument = innerWindow.document;
innerDocument.documentElement.classList.add('inner-editor', ...skinVariants); innerDocument.documentElement.classList.add('inner-editor', ...skinVariants);
@ -222,29 +225,13 @@ const Ace2Editor = function () {
const script = innerDocument.createElement('script'); const script = innerDocument.createElement('script');
script.type = 'text/javascript'; script.type = 'text/javascript';
script.src = `../static/js/require-kernel.js?v=${clientVars.randomVersionString}`; script.src = `../static/js/require-kernel.js?v=${clientVars.randomVersionString}`;
script.onload = postRequire;
innerDocument.head.appendChild(script); innerDocument.head.appendChild(script);
innerWindow.onload = () => { const styleI = innerDocument.createElement('style');
innerWindow.onload = null; styleI.type = 'text/css';
const window = innerWindow; styleI.title = 'dynamicsyntax';
const require = window.require; innerDocument.head.appendChild(styleI);
require.setRootURI('../javascripts/src');
require.setLibraryURI('../javascripts/lib');
require.setGlobalKeyPath('require');
window.plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
window.plugins.adoptPluginsFromAncestorsOf(window);
window.$ = window.jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery;
window.Ace2Inner = require('ep_etherpad-lite/static/js/ace2_inner');
window.plugins.ensure(() => window.Ace2Inner.init());
};
const style = innerDocument.createElement('style');
style.type = 'text/css';
style.title = 'dynamicsyntax';
innerDocument.head.appendChild(style);
const headLines = []; const headLines = [];
hooks.callAll('aceInitInnerdocbodyHead', {iframeHTML: headLines}); hooks.callAll('aceInitInnerdocbodyHead', {iframeHTML: headLines});
@ -257,21 +244,32 @@ const Ace2Editor = function () {
innerDocument.body.setAttribute('role', 'application'); innerDocument.body.setAttribute('role', 'application');
innerDocument.body.setAttribute('spellcheck', 'false'); innerDocument.body.setAttribute('spellcheck', 'false');
innerDocument.body.appendChild(innerDocument.createTextNode('\u00A0')); //   innerDocument.body.appendChild(innerDocument.createTextNode('\u00A0')); //  
}, 0); };
const iframe = outerDocument.createElement('iframe');
iframe.name = 'ace_inner';
iframe.title = 'pad';
iframe.scrolling = 'no';
iframe.frameBorder = 0;
iframe.allowTransparency = true; // for IE
iframe.ace_outerWin = outerWindow;
iframe.onload = postInnerFrame;
outerDocument.body.insertBefore(iframe, outerDocument.body.firstChild);
outerDocument.body.id = 'outerdocbody';
outerDocument.body.classList.add('outerdocbody', ...pluginUtils.clientPluginNames());
const sideDiv = outerDocument.createElement('div');
sideDiv.id = 'sidediv';
sideDiv.classList.add('sidediv');
outerDocument.body.appendChild(sideDiv);
const lineMetricsDiv = outerDocument.createElement('div');
lineMetricsDiv.id = 'linemetricsdiv';
lineMetricsDiv.appendChild(outerDocument.createTextNode('x'));
outerDocument.body.appendChild(lineMetricsDiv);
}; };
outerFrame.onload = postOuterFrame;
outerDocument.body.id = 'outerdocbody'; document.getElementById(containerId).appendChild(outerFrame);
outerDocument.body.classList.add('outerdocbody', ...pluginUtils.clientPluginNames());
const sideDiv = outerDocument.createElement('div');
sideDiv.id = 'sidediv';
sideDiv.classList.add('sidediv');
outerDocument.body.appendChild(sideDiv);
const lineMetricsDiv = outerDocument.createElement('div');
lineMetricsDiv.id = 'linemetricsdiv';
lineMetricsDiv.appendChild(outerDocument.createTextNode('x'));
outerDocument.body.appendChild(lineMetricsDiv);
}; };
}; };