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

Updates app.bundle.js

This commit is contained in:
paweldomas 2015-07-31 15:51:45 +02:00
parent df932bb89f
commit b8548757b4
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -22,7 +22,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=114"></script> <script src="libs/app.bundle.js?v=115"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/> <link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

17
libs/app.bundle.js
View File

@ -1162,14 +1162,11 @@ var RTC = {
this.localStreams[0].getOriginalStream() != stream) this.localStreams[0].getOriginalStream() != stream)
this.localStreams.push(localStream); this.localStreams.push(localStream);
if(isMuted === true) if(isMuted === true)
localStream.setMute(false); localStream.setMute(true);
if(type == "audio") if(type == "audio") {
{
this.localAudio = localStream; this.localAudio = localStream;
} } else {
else
{
this.localVideo = localStream; this.localVideo = localStream;
} }
var eventType = StreamEventTypes.EVENT_TYPE_LOCAL_CREATED; var eventType = StreamEventTypes.EVENT_TYPE_LOCAL_CREATED;
@ -14514,6 +14511,10 @@ JingleSession.prototype.addSource = function (elem, fromJid) {
console.warn("Got add stream request for my own ssrc: "+ssrc); console.warn("Got add stream request for my own ssrc: "+ssrc);
return; return;
} }
if (sdp.containsSSRC(ssrc)) {
console.warn("Source-add request for existing SSRC: " + ssrc);
return;
}
$(this).find('>parameter').each(function () { $(this).find('>parameter').each(function () {
lines += 'a=ssrc:' + ssrc + ' ' + $(this).attr('name'); lines += 'a=ssrc:' + ssrc + ' ' + $(this).attr('name');
if ($(this).attr('value') && $(this).attr('value').length) if ($(this).attr('value') && $(this).attr('value').length)
@ -18027,7 +18028,7 @@ module.exports = function(XMPP, eventEmitter)
var audioMuted = startMuted.attr("audio"); var audioMuted = startMuted.attr("audio");
var videoMuted = startMuted.attr("video"); var videoMuted = startMuted.attr("video");
eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS, eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
autioMuted === "true", videoMuted === "true"); audioMuted === "true", videoMuted === "true");
} }
sess = new JingleSession( sess = new JingleSession(
$(iq).attr('to'), $(iq).find('jingle').attr('sid'), $(iq).attr('to'), $(iq).find('jingle').attr('sid'),
@ -18898,7 +18899,7 @@ var XMPP = {
// It is not clear what is the right way to handle multiple tracks. // It is not clear what is the right way to handle multiple tracks.
// So at least make sure that they are all muted or all unmuted and // So at least make sure that they are all muted or all unmuted and
// that we send presence just once. // that we send presence just once.
APP.RTC.localAudio.setMute(!mute); APP.RTC.localAudio.setMute(mute);
// isMuted is the opposite of audioEnabled // isMuted is the opposite of audioEnabled
this.sendAudioInfoPresence(mute, callback); this.sendAudioInfoPresence(mute, callback);
return true; return true;