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

Fixes some issues caused by the merge.

This commit is contained in:
hristoterezov 2015-01-07 17:47:48 +02:00
parent 6ce48a5b7b
commit 4d25b139cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -158,7 +158,7 @@
<i id="mute" class="icon-microphone"></i> <i id="mute" class="icon-microphone"></i>
</a> </a>
<div class="header_button_separator"></div> <div class="header_button_separator"></div>
<a class="button" id="toolbar_button_camera" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="toggleVideoPopover" content="Start / stop camera" onclick='toggleVideo();'> <a class="button" id="toolbar_button_camera" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="toggleVideoPopover" content="Start / stop camera">
<i id="video" class="icon-camera"></i> <i id="video" class="icon-camera"></i>
</a> </a>
<span id="authentication" style="display: none"> <span id="authentication" style="display: none">

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

@ -91,7 +91,7 @@ ConnectionIndicator.prototype.generateText = function () {
} }
var resolutionValue = null; var resolutionValue = null;
if(this.resolution) if(this.resolution && this.jid != null)
{ {
var keys = Object.keys(this.resolution); var keys = Object.keys(this.resolution);
if(keys.length == 1) if(keys.length == 1)