repo: janusweb action: commit revision: path_from: revision_from: 04150aec28dee8bb5f9d80ad114222b807245828: path_to: revision_to:
commit 04150aec28dee8bb5f9d80ad114222b807245828 Author: James BaicoianuDate: Sun Sep 10 01:30:42 2023 -0700 Improved player handling of non-janus children diff --git a/scripts/janusplayer.js b/scripts/janusplayer.js
--- a/scripts/janusplayer.js
+++ b/scripts/janusplayer.js
@@ -848,11 +848,18 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
if (proxyobj) {
//var realobj = this.room.getObjectFromProxy(proxyobj);
if (proxyobj.parent) {
- proxyobj.parent.removeChild(proxyobj);
+ if (typeof proxyobj.parent.removeChild == 'function') {
+ proxyobj.parent.removeChild(proxyobj);
+ } else if (typeof proxyobj.parent.remove == 'function') {
+ proxyobj.parent.remove(proxyobj._target);
+ }
}
var realobj = proxyobj._target;
if (realobj) {
this.add(realobj);
+ if (typeof realobj.start == 'function') {
+ realobj.start();
+ }
}
}
}
@@ -865,6 +872,9 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
//var realobj = this.room.getObjectFromProxy(proxyobj);
var realobj = proxyobj._target;
if (realobj) {
+ if (typeof realobj.stop == 'function') {
+ realobj.stop();
+ }
this.remove(realobj);
}
}
-----END OF PAGE-----