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

Fixes audio mute.

This commit is contained in:
hristoterezov 2015-06-30 14:34:11 +03:00
parent f11c3b94ed
commit 6235ff163e
5 changed files with 5 additions and 9 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=92"></script> <script src="libs/app.bundle.js?v=93"></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">

6
libs/app.bundle.js
View File

@ -7902,7 +7902,7 @@ SmallVideo.prototype.hideIndicator = function () {
SmallVideo.prototype.showAudioIndicator = function(isMuted) { SmallVideo.prototype.showAudioIndicator = function(isMuted) {
var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted'); var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted');
if (isMuted === 'false') { if (!isMuted) {
if (audioMutedSpan.length > 0) { if (audioMutedSpan.length > 0) {
audioMutedSpan.popover('hide'); audioMutedSpan.popover('hide');
audioMutedSpan.remove(); audioMutedSpan.remove();
@ -8456,7 +8456,7 @@ var VideoLayout = (function (my) {
* @param {boolean} isMuted * @param {boolean} isMuted
*/ */
my.showLocalAudioIndicator = function(isMuted) { my.showLocalAudioIndicator = function(isMuted) {
localVideoThumbnail.showAudioIndicator(isMuted.toString()); localVideoThumbnail.showAudioIndicator(isMuted);
}; };
/** /**
@ -14988,7 +14988,6 @@ module.exports = function(XMPP, eventEmitter) {
if (audioMuted.length) { if (audioMuted.length) {
eventEmitter.emit(XMPPEvents.AUDIO_MUTED, eventEmitter.emit(XMPPEvents.AUDIO_MUTED,
from, (audioMuted.text() === "true")); from, (audioMuted.text() === "true"));
$(document).trigger('audiomuted.muc', [from, ]);
} }
// Parse video info tag. // Parse video info tag.
@ -14996,7 +14995,6 @@ module.exports = function(XMPP, eventEmitter) {
if (videoMuted.length) { if (videoMuted.length) {
eventEmitter.emit(XMPPEvents.VIDEO_MUTED, eventEmitter.emit(XMPPEvents.VIDEO_MUTED,
from, (videoMuted.text() === "true")); from, (videoMuted.text() === "true"));
$(document).trigger('videomuted.muc', [from, ]);
} }
var startMuted = $(pres).find('>startmuted'); var startMuted = $(pres).find('>startmuted');

2
modules/UI/videolayout/SmallVideo.js
View File

@ -126,7 +126,7 @@ SmallVideo.prototype.hideIndicator = function () {
SmallVideo.prototype.showAudioIndicator = function(isMuted) { SmallVideo.prototype.showAudioIndicator = function(isMuted) {
var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted'); var audioMutedSpan = $('#' + this.videoSpanId + '>span.audioMuted');
if (isMuted === 'false') { if (!isMuted) {
if (audioMutedSpan.length > 0) { if (audioMutedSpan.length > 0) {
audioMutedSpan.popover('hide'); audioMutedSpan.popover('hide');
audioMutedSpan.remove(); audioMutedSpan.remove();

2
modules/UI/videolayout/VideoLayout.js
View File

@ -328,7 +328,7 @@ var VideoLayout = (function (my) {
* @param {boolean} isMuted * @param {boolean} isMuted
*/ */
my.showLocalAudioIndicator = function(isMuted) { my.showLocalAudioIndicator = function(isMuted) {
localVideoThumbnail.showAudioIndicator(isMuted.toString()); localVideoThumbnail.showAudioIndicator(isMuted);
}; };
/** /**

2
modules/xmpp/strophe.emuc.js
View File

@ -145,7 +145,6 @@ module.exports = function(XMPP, eventEmitter) {
if (audioMuted.length) { if (audioMuted.length) {
eventEmitter.emit(XMPPEvents.AUDIO_MUTED, eventEmitter.emit(XMPPEvents.AUDIO_MUTED,
from, (audioMuted.text() === "true")); from, (audioMuted.text() === "true"));
$(document).trigger('audiomuted.muc', [from, ]);
} }
// Parse video info tag. // Parse video info tag.
@ -153,7 +152,6 @@ module.exports = function(XMPP, eventEmitter) {
if (videoMuted.length) { if (videoMuted.length) {
eventEmitter.emit(XMPPEvents.VIDEO_MUTED, eventEmitter.emit(XMPPEvents.VIDEO_MUTED,
from, (videoMuted.text() === "true")); from, (videoMuted.text() === "true"));
$(document).trigger('videomuted.muc', [from, ]);
} }
var startMuted = $(pres).find('>startmuted'); var startMuted = $(pres).find('>startmuted');