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

Fixes setting of default display name in remote videos.

This commit is contained in:
yanas 2014-08-27 09:20:05 +02:00
parent c00f60f57b
commit eec2c487fd
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app.js
View File

@ -594,14 +594,9 @@ $(document).bind('joined.muc', function (event, jid, info) {
// Once we've joined the muc show the toolbar // Once we've joined the muc show the toolbar
Toolbar.showToolbar(); Toolbar.showToolbar();
var displayName = '';
if (info.displayName) if (info.displayName)
displayName = info.displayName + ' (me)'; $(document).trigger('displaynamechanged',
else ['localVideoContainer', info.displayName + ' (me)']);
displayName = "Me";
$(document).trigger('displaynamechanged',
['localVideoContainer', displayName]);
}); });
$(document).bind('entered.muc', function (event, jid, info, pres) { $(document).bind('entered.muc', function (event, jid, info, pres) {

3
index.html
View File

@ -58,7 +58,7 @@
<link rel="stylesheet" href="css/popup_menu.css?v=2"> <link rel="stylesheet" href="css/popup_menu.css?v=2">
<link rel="stylesheet" href="css/popover.css?v=1"> <link rel="stylesheet" href="css/popover.css?v=1">
<link rel="stylesheet" href="css/contact_list.css?v=1"> <link rel="stylesheet" href="css/contact_list.css?v=1">
<link rel="stylesheet" href="css/welcome_page.css?v=1"> <link rel="stylesheet" href="css/welcome_page.css?v=1">
<!-- <!--
Link used for inline installation of chrome desktop streaming extension, Link used for inline installation of chrome desktop streaming extension,
is updated automatically from the code with the value defined in config.js --> is updated automatically from the code with the value defined in config.js -->
@ -277,6 +277,5 @@
</div> </div>
<a id="downloadlog" onclick='dump(event.target);' data-toggle="popover" data-placement="right" data-content="Download logs" ><i class="fa fa-cloud-download"></i></a> <a id="downloadlog" onclick='dump(event.target);' data-toggle="popover" data-placement="right" data-content="Download logs" ><i class="fa fa-cloud-download"></i></a>
</div> </div>
</body> </body>
</html> </html>

9
videolayout.js
View File

@ -28,6 +28,9 @@ var VideoLayout = (function (my) {
var localVideoContainer = document.getElementById('localVideoWrapper'); var localVideoContainer = document.getElementById('localVideoWrapper');
localVideoContainer.appendChild(localVideo); localVideoContainer.appendChild(localVideo);
// Set default display name.
setDisplayName('localVideoContainer');
AudioLevels.updateAudioLevelCanvas(); AudioLevels.updateAudioLevelCanvas();
var localVideoSelector = $('#' + localVideo.id); var localVideoSelector = $('#' + localVideo.id);
@ -103,7 +106,6 @@ var VideoLayout = (function (my) {
} }
}; };
/** /**
* Updates the large video with the given new video source. * Updates the large video with the given new video source.
*/ */
@ -306,6 +308,9 @@ var VideoLayout = (function (my) {
var container var container
= VideoLayout.addRemoteVideoContainer(peerJid, videoSpanId); = VideoLayout.addRemoteVideoContainer(peerJid, videoSpanId);
// Set default display name.
setDisplayName(videoSpanId);
var nickfield = document.createElement('span'); var nickfield = document.createElement('span');
nickfield.className = "nick"; nickfield.className = "nick";
nickfield.appendChild(document.createTextNode(resourceJid)); nickfield.appendChild(document.createTextNode(resourceJid));
@ -541,7 +546,7 @@ var VideoLayout = (function (my) {
editableText.className = 'displayname'; editableText.className = 'displayname';
editableText.id = 'editDisplayName'; editableText.id = 'editDisplayName';
if (displayName.length) { if (displayName && displayName.length) {
editableText.value editableText.value
= displayName.substring(0, displayName.indexOf(' (me)')); = displayName.substring(0, displayName.indexOf(' (me)'));
} }