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

Fixes JS errors on Temasys

This commit is contained in:
hristoterezov 2015-12-09 16:17:28 +11:00
parent 73232be8be
commit ac88c5cedc
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib-jitsi-meet.js
View File

@ -1397,7 +1397,7 @@ JitsiLocalTrack.prototype.stop = function () {
if(!this.stream)
return;
if(this.rtc)
this.rtc.room.removeStream(this.stream);
this.rtc.room.removeStream(this.stream, function () {});
RTC.stopMediaStream(this.stream);
this.detach();
}
@ -1547,9 +1547,18 @@ function implementOnEndedHandling(jitsiTrack) {
function addMediaStreamInactiveHandler(mediaStream, handler) {
if(RTCBrowserType.isTemasysPluginUsed()) {
// themasys
mediaStream.attachEvent('ended', function () {
handler(mediaStream);
});
//FIXME: Seems that not working properly.
if(mediaStream.onended) {
mediaStream.onended = handler;
} else if(mediaStream.addEventListener) {
mediaStream.addEventListener('ended', function () {
handler(mediaStream);
});
} else if(mediaStream.attachEvent) {
mediaStream.attachEvent('ended', function () {
handler(mediaStream);
});
}
}
else {
if(typeof mediaStream.active !== "undefined")

2
modules/RTC/JitsiLocalTrack.js
View File

@ -112,7 +112,7 @@ JitsiLocalTrack.prototype.stop = function () {
if(!this.stream)
return;
if(this.rtc)
this.rtc.room.removeStream(this.stream);
this.rtc.room.removeStream(this.stream, function () {});
RTC.stopMediaStream(this.stream);
this.detach();
}

15
modules/RTC/JitsiTrack.js
View File

@ -27,9 +27,18 @@ function implementOnEndedHandling(jitsiTrack) {
function addMediaStreamInactiveHandler(mediaStream, handler) {
if(RTCBrowserType.isTemasysPluginUsed()) {
// themasys
mediaStream.attachEvent('ended', function () {
handler(mediaStream);
});
//FIXME: Seems that not working properly.
if(mediaStream.onended) {
mediaStream.onended = handler;
} else if(mediaStream.addEventListener) {
mediaStream.addEventListener('ended', function () {
handler(mediaStream);
});
} else if(mediaStream.attachEvent) {
mediaStream.attachEvent('ended', function () {
handler(mediaStream);
});
}
}
else {
if(typeof mediaStream.active !== "undefined")