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: Remove unnecessary includeJquery parameter

Browse source
This commit is contained in:
Richard Hansen 2021-07-22 13:28:17 -04:00 • committed by webzwo0i
parent ed6fa9400a
commit 01184cd1aa
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,11 +34,11 @@ helper.multipleUsers = {
},
async _loadJQueryForUser1Frame() {
this._user1.padChrome$ = await getFrameJQuery(this._user1.$frame, true, true);
this._user1.padChrome$ = await getFrameJQuery(this._user1.$frame, true);
this._user1.padOuter$ =
await getFrameJQuery(this._user1.padChrome$('iframe[name="ace_outer"]'), true, false);
await getFrameJQuery(this._user1.padChrome$('iframe[name="ace_outer"]'), false);
this._user1.padInner$ =
await getFrameJQuery(this._user1.padOuter$('iframe[name="ace_inner"]'), true, true);
await getFrameJQuery(this._user1.padOuter$('iframe[name="ace_inner"]'), true);
// update helper vars now that they are available
helper.padChrome$ = this._user1.padChrome$;
@ -80,7 +80,7 @@ helper.multipleUsers = {
};
// copied from helper.js
const getFrameJQuery = async ($iframe, includeJquery = false, includeSendkeys = false) => {
const getFrameJQuery = async ($iframe, includeSendkeys = false) => {
const win = $iframe[0].contentWindow;
const doc = win.document;
@ -101,7 +101,7 @@ const getFrameJQuery = async ($iframe, includeJquery = false, includeSendkeys =
await p;
};
if (!win.$ && includeJquery) await load('../../static/js/vendors/jquery.js');
if (!win.$) await load('../../static/js/vendors/jquery.js');
if (!win.bililiteRange && includeSendkeys) await load('../tests/frontend/lib/sendkeys.js');
win.$.window = win;