haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce the dependencies of the Web ExternalAPI 

We broke external_api.min.js by importing react/features/util which
imported react/features/base/lib-jitsi-meet.

1. To reduce the risks of such a breakage until we add
   external_api.min.js to the torture tests, import as little as
   possible in modules/API/external/external_api.js.
2. Use the global JitsiMeetJS on Web in react/features/base/util.
This commit is contained in:
Lyubo Marinov 2017-09-06 23:20:04 -05:00
parent fce0e4c22c
commit 15ab7a292c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/API/external/external_api.js vendored
View File

@ -1,6 +1,6 @@
import EventEmitter from 'events'; import EventEmitter from 'events';
import { urlObjectToString } from '../../../react/features/base/util'; import { urlObjectToString } from '../../../react/features/base/util/uri.js';
import { import {
PostMessageTransportBackend, PostMessageTransportBackend,
Transport Transport

10
react/features/base/util/loadScript.web.js
View File

@ -1,4 +1,6 @@
import JitsiMeetJS from '../lib-jitsi-meet'; /* @flow */
declare var JitsiMeetJS: Object;
/** /**
* Loads a script from a specific URL. The script will be interpreted upon load. * Loads a script from a specific URL. The script will be interpreted upon load.
@ -7,13 +9,13 @@ import JitsiMeetJS from '../lib-jitsi-meet';
* @returns {Promise} Resolved with no arguments when the script is loaded and * @returns {Promise} Resolved with no arguments when the script is loaded and
* rejected with the error from JitsiMeetJS.ScriptUtil.loadScript method. * rejected with the error from JitsiMeetJS.ScriptUtil.loadScript method.
*/ */
export function loadScript(url) { export function loadScript(url: string) {
return new Promise((resolve, reject) => return new Promise((resolve, reject) =>
JitsiMeetJS.util.ScriptUtil.loadScript( JitsiMeetJS.util.ScriptUtil.loadScript(
url, url,
/* async */ true, /* async */ true,
/* prepend */ false, /* prepend */ false,
/* relativeURL */ false, /* relativeURL */ false,
/* loadCallback */ () => resolve(), /* loadCallback */ resolve,
/* errorCallback */ error => reject(error))); /* errorCallback */ reject));
} }