From 69217b79e7c9d0c0238b49fb54396b2d443927f1 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Mon, 16 Nov 2015 18:07:04 -0600 Subject: [PATCH] Fixes small issues from the previous commits + fixes IE 10 issues. --- JitsiConference.js | 2 +- JitsiMeetJS.js | 3 ++- lib-jitsi-meet.js | 20 ++++++++++++-------- modules/RTC/RTCUtils.js | 4 ++-- modules/xmpp/JingleSessionPC.js | 8 +++++--- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/JitsiConference.js b/JitsiConference.js index 00a643c90..378e3d8d3 100644 --- a/JitsiConference.js +++ b/JitsiConference.js @@ -173,7 +173,7 @@ JitsiConference.prototype.setDisplayName = function(name) { */ JitsiConference.prototype.addTrack = function (track) { this.rtc.addLocalStream(track); - this.room.addStream(track.getOriginalStream, function () {}); + this.room.addStream(track.getOriginalStream(), function () {}); } /** diff --git a/JitsiMeetJS.js b/JitsiMeetJS.js index 9d5386bea..9218a5bc3 100644 --- a/JitsiMeetJS.js +++ b/JitsiMeetJS.js @@ -52,7 +52,8 @@ var LibJitsiMeet = { } }; +require("es6-promise").polyfill() //Setups the promise object. -window.Promise = window.Promise || require("es6-promise").polyfill(); +window.Promise = window.Promise || require("es6-promise").Promise; module.exports = LibJitsiMeet; diff --git a/lib-jitsi-meet.js b/lib-jitsi-meet.js index 050c4eb9d..6ed6eba95 100644 --- a/lib-jitsi-meet.js +++ b/lib-jitsi-meet.js @@ -175,7 +175,7 @@ JitsiConference.prototype.setDisplayName = function(name) { */ JitsiConference.prototype.addTrack = function (track) { this.rtc.addLocalStream(track); - this.room.addStream(track.getOriginalStream, function () {}); + this.room.addStream(track.getOriginalStream(), function () {}); } /** @@ -259,6 +259,7 @@ function setupListeners(conference) { }); conference.rtc.addListener(StreamEventTypes.EVENT_TYPE_LOCAL_ENDED, function (stream) { conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, stream); + conference.removeTrack(stream); }); conference.rtc.addListener(StreamEventTypes.TRACK_MUTE_CHANGED, function (track) { conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_MUTE_CHANGED, track); @@ -640,8 +641,9 @@ var LibJitsiMeet = { } }; +require("es6-promise").polyfill() //Setups the promise object. -window.Promise = window.Promise || require("es6-promise").polyfill(); +window.Promise = window.Promise || require("es6-promise").Promise; module.exports = LibJitsiMeet; @@ -2273,7 +2275,7 @@ var RTCUtils = { AdapterJS.webRTCReady(function (isPlugin) { self.peerconnection = RTCPeerConnection; - self.getUserMedia = getUserMedia; + self.getUserMedia = window.getUserMedia; self.enumerateDevices = enumerateDevicesThroughMediaStreamTrack; self.attachMediaStream = function (elSel, stream) { @@ -2437,7 +2439,7 @@ var RTCUtils = { self.errorCallback(error, resolve, options); },{micDeviceId: options.micDeviceId}); }; - if((devices.indexOf('audio') === -1)) + if((options.devices.indexOf('audio') === -1)) obtainVideo(null) else obtainAudio(); @@ -6659,7 +6661,7 @@ JingleSessionPC.prototype.setRemoteDescription = function (elem, desctype) { this.remoteSDP = new SDP(''); this.remoteSDP.fromJingle(elem); this.readSsrcInfo($(elem).find(">content")); - if (this.peerconnection.remoteDescription !== null) { + if (this.peerconnection.remoteDescription) { logger.log('setRemoteDescription when remote description is not null, should be pranswer', this.peerconnection.remoteDescription); if (this.peerconnection.remoteDescription.type == 'pranswer') { var pranswer = new SDP(this.peerconnection.remoteDescription.sdp); @@ -7485,6 +7487,8 @@ JingleSessionPC.onJingleFatalError = function (session, error) JingleSessionPC.prototype.setLocalDescription = function () { var self = this; var newssrcs = []; + if(!this.peerconnection.localDescription) + return; var session = transform.parse(this.peerconnection.localDescription.sdp); session.media.forEach(function (media) { @@ -7569,8 +7573,8 @@ JingleSessionPC.prototype.remoteStreamAdded = function (data, times) { } else if (streamId && streamId.indexOf('mixedmslabel') === -1) { // look only at a=ssrc: and _not_ at a=ssrc-group: lines - var ssrclines - = SDPUtil.find_lines(this.peerconnection.remoteDescription.sdp, 'a=ssrc:'); + var ssrclines = this.peerconnection.remoteDescription? + SDPUtil.find_lines(this.peerconnection.remoteDescription.sdp, 'a=ssrc:') : []; ssrclines = ssrclines.filter(function (line) { // NOTE(gp) previously we filtered on the mslabel, but that property // is not always present. @@ -13466,7 +13470,7 @@ function getCallerInfo() { }; //gets the part of the stack without the logger wrappers var error = new Error(); - var stack = error.stack.split("\n"); + var stack = error.stack? error.stack.split("\n") : []; if(!stack || stack.length < 1) { return callerInfo; } diff --git a/modules/RTC/RTCUtils.js b/modules/RTC/RTCUtils.js index e1954951f..1a08bcfe0 100644 --- a/modules/RTC/RTCUtils.js +++ b/modules/RTC/RTCUtils.js @@ -453,7 +453,7 @@ var RTCUtils = { AdapterJS.webRTCReady(function (isPlugin) { self.peerconnection = RTCPeerConnection; - self.getUserMedia = getUserMedia; + self.getUserMedia = window.getUserMedia; self.enumerateDevices = enumerateDevicesThroughMediaStreamTrack; self.attachMediaStream = function (elSel, stream) { @@ -617,7 +617,7 @@ var RTCUtils = { self.errorCallback(error, resolve, options); },{micDeviceId: options.micDeviceId}); }; - if((devices.indexOf('audio') === -1)) + if((options.devices.indexOf('audio') === -1)) obtainVideo(null) else obtainAudio(); diff --git a/modules/xmpp/JingleSessionPC.js b/modules/xmpp/JingleSessionPC.js index 55206268a..024a8709e 100644 --- a/modules/xmpp/JingleSessionPC.js +++ b/modules/xmpp/JingleSessionPC.js @@ -535,7 +535,7 @@ JingleSessionPC.prototype.setRemoteDescription = function (elem, desctype) { this.remoteSDP = new SDP(''); this.remoteSDP.fromJingle(elem); this.readSsrcInfo($(elem).find(">content")); - if (this.peerconnection.remoteDescription !== null) { + if (this.peerconnection.remoteDescription) { logger.log('setRemoteDescription when remote description is not null, should be pranswer', this.peerconnection.remoteDescription); if (this.peerconnection.remoteDescription.type == 'pranswer') { var pranswer = new SDP(this.peerconnection.remoteDescription.sdp); @@ -1361,6 +1361,8 @@ JingleSessionPC.onJingleFatalError = function (session, error) JingleSessionPC.prototype.setLocalDescription = function () { var self = this; var newssrcs = []; + if(!this.peerconnection.localDescription) + return; var session = transform.parse(this.peerconnection.localDescription.sdp); session.media.forEach(function (media) { @@ -1445,8 +1447,8 @@ JingleSessionPC.prototype.remoteStreamAdded = function (data, times) { } else if (streamId && streamId.indexOf('mixedmslabel') === -1) { // look only at a=ssrc: and _not_ at a=ssrc-group: lines - var ssrclines - = SDPUtil.find_lines(this.peerconnection.remoteDescription.sdp, 'a=ssrc:'); + var ssrclines = this.peerconnection.remoteDescription? + SDPUtil.find_lines(this.peerconnection.remoteDescription.sdp, 'a=ssrc:') : []; ssrclines = ssrclines.filter(function (line) { // NOTE(gp) previously we filtered on the mslabel, but that property // is not always present.