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

Fixes unintentially reverted commit by Philipp Hancke 40af39a.

This commit is contained in:
Yana Stamcheva 2014-02-06 12:12:32 +01:00
parent bee3792b1d
commit c81406d8c9
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app.js
View File

@ -99,7 +99,6 @@ function doJoin() {
$(document).bind('mediaready.jingle', function (event, stream) { $(document).bind('mediaready.jingle', function (event, stream) {
connection.jingle.localStream = stream; connection.jingle.localStream = stream;
RTC.attachMediaStream($('#localVideo'), stream); RTC.attachMediaStream($('#localVideo'), stream);
document.getElementById('localVideo').muted = true;
document.getElementById('localVideo').autoplay = true; document.getElementById('localVideo').autoplay = true;
document.getElementById('localVideo').volume = 0; document.getElementById('localVideo').volume = 0;
@ -107,7 +106,13 @@ $(document).bind('mediaready.jingle', function (event, stream) {
updateLargeVideo(localVideoSrc, true, 0); updateLargeVideo(localVideoSrc, true, 0);
$('#localVideo').click(function () { $('#localVideo').click(function () {
updateLargeVideo($(this).attr('src'), true, 1); updateLargeVideo($(this).attr('src'), true, 0);
$('video').each(function (idx, el) {
if (el.id.indexOf('mixedmslabel') != -1) {
el.volume = 0;
el.volume = 1;
}
});
}); });
doJoin(); doJoin();
@ -1102,4 +1107,3 @@ function scrollChatToBottom() {
$('#chatconversation').scrollTop($('#chatconversation')[0].scrollHeight); $('#chatconversation').scrollTop($('#chatconversation')[0].scrollHeight);
}, 5); }, 5);
} }

2
index.html
View File

@ -7,7 +7,7 @@
<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script> <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
<script src="muc.js?v=4"></script><!-- simple MUC library --> <script src="muc.js?v=4"></script><!-- simple MUC library -->
<script src="estos_log.js?v=2"></script><!-- simple stanza logger --> <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
<script src="app.js?v=11"></script><!-- application logic --> <script src="app.js?v=12"></script><!-- application logic -->
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=12"/> <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=12"/>
<link rel="stylesheet" href="css/jquery-impromptu.css?v=3"> <link rel="stylesheet" href="css/jquery-impromptu.css?v=3">