libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

move require of Ace2Inner up

Browse source
This commit is contained in:
webzwo0i 2021-02-28 18:46:05 +01:00
parent 874f2ccc88
commit 576be344e4
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/static/js/ace.js
View file

@ -171,7 +171,6 @@ const Ace2Editor = function () {
const outerFrame = document.createElement('iframe'); const outerFrame = document.createElement('iframe');
outerFrame.name = 'ace_outer'; outerFrame.name = 'ace_outer';
outerFrame.frameBorder = 0; // for IE
outerFrame.title = 'Ether'; outerFrame.title = 'Ether';
info.frame = outerFrame; info.frame = outerFrame;
@ -202,12 +201,13 @@ const Ace2Editor = function () {
require.setLibraryURI('../javascripts/lib'); require.setLibraryURI('../javascripts/lib');
require.setGlobalKeyPath('require'); require.setGlobalKeyPath('require');
w.Ace2Inner = require('ep_etherpad-lite/static/js/ace2_inner');
w.plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins'); w.plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
w.plugins.adoptPluginsFromAncestorsOf(w); w.plugins.adoptPluginsFromAncestorsOf(w);
w.jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; w.jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery;
w.$ = w.jQuery; w.$ = w.jQuery;
w.Ace2Inner = require('ep_etherpad-lite/static/js/ace2_inner');
w.plugins.ensure(() => w.Ace2Inner.init()); w.plugins.ensure(() => w.Ace2Inner.init());
}; };
@ -248,8 +248,6 @@ const Ace2Editor = function () {
const iframe = outerDocument.createElement('iframe'); const iframe = outerDocument.createElement('iframe');
iframe.name = 'ace_inner'; iframe.name = 'ace_inner';
iframe.title = 'pad'; iframe.title = 'pad';
iframe.scrolling = 'no';
iframe.frameBorder = 0;
iframe.allowTransparency = true; // for IE iframe.allowTransparency = true; // for IE
iframe.ace_outerWin = outerWindow; iframe.ace_outerWin = outerWindow;
iframe.onload = postInnerFrame; iframe.onload = postInnerFrame;