mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 17:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

tests: refactor inclusion of jquery and sendkeys via script tags

Browse source 
Readability is increased by explicitly checking if jquery/sendkeys was
already loaded before evaluating it in the context of ace_inner and the
enclosing container (pad.html). Note that sendkeys is no longer
evaluated in the context of ace_outer, as this isn't needed

Also removes some IE 8/9 legacy code
This commit is contained in:
webzwo0i 2021-07-04 05:36:35 +02:00
parent 4ceb3ca4c8
commit 62093adce5
4 changed files with 51 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/tests/frontend/helper/multipleUsers.js
View file

@ -34,18 +34,11 @@ helper.multipleUsers = {
},
async _loadJQueryForUser1Frame() {
const code = await $.get('/static/js/jquery.js');
// make sure we don't override existing jquery
const jQueryCode = `if(typeof $ === "undefined") {\n${code}\n}`;
const sendkeysCode = await $.get('/tests/frontend/lib/sendkeys.js');
const codesToLoad = [jQueryCode, sendkeysCode];
this._user1.padChrome$ = getFrameJQuery(codesToLoad, this._user1.$frame);
this._user1.padChrome$ = await getFrameJQuery(this._user1.$frame, true, true);
this._user1.padOuter$ =
getFrameJQuery(codesToLoad, this._user1.padChrome$('iframe[name="ace_outer"]'));
await getFrameJQuery(this._user1.padChrome$('iframe[name="ace_outer"]'), true, false);
this._user1.padInner$ =
getFrameJQuery(codesToLoad, this._user1.padOuter$('iframe[name="ace_inner"]'));
await getFrameJQuery(this._user1.padOuter$('iframe[name="ace_inner"]'), true, true);
// update helper vars now that they are available
helper.padChrome$ = this._user1.padChrome$;
@ -86,14 +79,30 @@ helper.multipleUsers = {
},
};
// adapted form helper.js on Etherpad code
const getFrameJQuery = (codesToLoad, $iframe) => {
// copied from helper.js
const getFrameJQuery = async ($iframe, includeJquery = false, includeSendkeys = false) => {
const win = $iframe[0].contentWindow;
const doc = win.document;
for (let i = 0; i < codesToLoad.length; i++) {
win.eval(codesToLoad[i]);
}
const load = async (url) => {
const elem = doc.createElement('script');
elem.setAttribute('src', url);
const p = new Promise((resolve, reject) => {
const handler = (evt) => {
elem.removeEventListener('load', handler);
elem.removeEventListener('error', handler);
if (evt.type === 'error') return reject(new Error(`failed to load ${url}`));
resolve();
};
elem.addEventListener('load', handler);
elem.addEventListener('error', handler);
});
doc.head.appendChild(elem);
await p;
};
if (!win.$ && includeJquery) await load('../../static/js/vendors/jquery.js');
if (!win.bililiteRange && includeSendkeys) await load('../tests/frontend/lib/sendkeys.js');
win.$.window = win;
win.$.document = doc;