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

Merge pull request #1518 from jitsi/fix_removeListeners 

fix(external_api): JS error in removeListeners and simplifies dispose
This commit is contained in:
Saúl Ibarra Corretgé 2017-04-20 23:47:15 +02:00 committed by GitHub
parent 7be8e3e1e9 55f5ceb85a
commit 607bef8d68
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,16 +319,14 @@ class JitsiMeetExternalAPI extends EventEmitter {
* @returns {void} * @returns {void}
*/ */
dispose() { dispose() {
const frame = document.getElementById(this.frameName); if (this.postis) {
this.postis.destroy();
this.postis.destroy(); this.postis = null;
if (frame) {
frame.src = 'about:blank';
} }
window.setTimeout(() => { this.removeAllListeners();
this.iframeHolder.removeChild(this.frame); if (this.iframeHolder) {
this.iframeHolder.parentNode.removeChild(this.iframeHolder); this.iframeHolder.parentNode.removeChild(this.iframeHolder);
}, 10); }
} }
/** /**
@ -350,6 +348,13 @@ class JitsiMeetExternalAPI extends EventEmitter {
return; return;
} }
if (!this.postis) {
logger.error('Cannot execute command using disposed instance.');
return;
}
this.postis.send({ this.postis.send({
method: commands[name], method: commands[name],
params: args params: args
@ -398,7 +403,7 @@ class JitsiMeetExternalAPI extends EventEmitter {
* NOTE: This method is not removed for backward comatability purposes. * NOTE: This method is not removed for backward comatability purposes.
*/ */
removeEventListener(event) { removeEventListener(event) {
this.removeListeners(event); this.removeAllListeners(event);
} }
/** /**