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

Adds an interface configuration object.

This commit is contained in:
fo 2014-09-18 15:39:40 +03:00
parent 97f9a40cfa
commit 3b8af470ca
5 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
audio_levels.js
View File

@ -2,9 +2,6 @@
* The audio Levels plugin. * The audio Levels plugin.
*/ */
var AudioLevels = (function(my) { var AudioLevels = (function(my) {
var CANVAS_EXTRA = 104;
var CANVAS_RADIUS = 7;
var SHADOW_COLOR = '#00ccff';
var audioLevelCanvasCache = {}; var audioLevelCanvasCache = {};
my.LOCAL_LEVEL = 'local'; my.LOCAL_LEVEL = 'local';
@ -47,8 +44,8 @@ var AudioLevels = (function(my) {
audioLevelCanvas = document.createElement('canvas'); audioLevelCanvas = document.createElement('canvas');
audioLevelCanvas.className = "audiolevel"; audioLevelCanvas.className = "audiolevel";
audioLevelCanvas.style.bottom = "-" + CANVAS_EXTRA/2 + "px"; audioLevelCanvas.style.bottom = "-" + interfaceConfig.CANVAS_EXTRA/2 + "px";
audioLevelCanvas.style.left = "-" + CANVAS_EXTRA/2 + "px"; audioLevelCanvas.style.left = "-" + interfaceConfig.CANVAS_EXTRA/2 + "px";
resizeAudioLevelCanvas( audioLevelCanvas, resizeAudioLevelCanvas( audioLevelCanvas,
thumbnailWidth, thumbnailWidth,
thumbnailHeight); thumbnailHeight);
@ -95,8 +92,8 @@ var AudioLevels = (function(my) {
function resizeAudioLevelCanvas(audioLevelCanvas, function resizeAudioLevelCanvas(audioLevelCanvas,
thumbnailWidth, thumbnailWidth,
thumbnailHeight) { thumbnailHeight) {
audioLevelCanvas.width = thumbnailWidth + CANVAS_EXTRA; audioLevelCanvas.width = thumbnailWidth + interfaceConfig.CANVAS_EXTRA;
audioLevelCanvas.height = thumbnailHeight + CANVAS_EXTRA; audioLevelCanvas.height = thumbnailHeight + interfaceConfig.CANVAS_EXTRA;
}; };
/** /**
@ -140,11 +137,11 @@ var AudioLevels = (function(my) {
if (shadowLevel > 0) if (shadowLevel > 0)
// drawContext, x, y, w, h, r, shadowColor, shadowLevel // drawContext, x, y, w, h, r, shadowColor, shadowLevel
CanvasUtil.drawRoundRectGlow( drawContext, CanvasUtil.drawRoundRectGlow( drawContext,
CANVAS_EXTRA/2, CANVAS_EXTRA/2, interfaceConfig.CANVAS_EXTRA/2, interfaceConfig.CANVAS_EXTRA/2,
canvas.width - CANVAS_EXTRA, canvas.width - interfaceConfig.CANVAS_EXTRA,
canvas.height - CANVAS_EXTRA, canvas.height - interfaceConfig.CANVAS_EXTRA,
CANVAS_RADIUS, interfaceConfig.CANVAS_RADIUS,
SHADOW_COLOR, interfaceConfig.SHADOW_COLOR,
shadowLevel); shadowLevel);
}; };
@ -158,13 +155,13 @@ var AudioLevels = (function(my) {
var shadowLevel = 0; var shadowLevel = 0;
if (audioLevel <= 0.3) { if (audioLevel <= 0.3) {
shadowLevel = Math.round(CANVAS_EXTRA/2*(audioLevel/0.3)); shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*(audioLevel/0.3));
} }
else if (audioLevel <= 0.6) { else if (audioLevel <= 0.6) {
shadowLevel = Math.round(CANVAS_EXTRA/2*((audioLevel - 0.3) / 0.3)); shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.3) / 0.3));
} }
else { else {
shadowLevel = Math.round(CANVAS_EXTRA/2*((audioLevel - 0.6) / 0.4)); shadowLevel = Math.round(interfaceConfig.CANVAS_EXTRA/2*((audioLevel - 0.6) / 0.4));
} }
return shadowLevel; return shadowLevel;
}; };
@ -192,13 +189,13 @@ var AudioLevels = (function(my) {
var resized = false; var resized = false;
$('#remoteVideos>span>canvas').each(function() { $('#remoteVideos>span>canvas').each(function() {
var canvas = $(this).get(0); var canvas = $(this).get(0);
if (canvas.width !== width + CANVAS_EXTRA) { if (canvas.width !== width + interfaceConfig.CANVAS_EXTRA) {
canvas.width = width + CANVAS_EXTRA; canvas.width = width + interfaceConfig.CANVAS_EXTRA;
resized = true; resized = true;
} }
if (canvas.heigh !== height + CANVAS_EXTRA) { if (canvas.heigh !== height + interfaceConfig.CANVAS_EXTRA) {
canvas.height = height + CANVAS_EXTRA; canvas.height = height + interfaceConfig.CANVAS_EXTRA;
resized = true; resized = true;
} }
}); });
@ -206,9 +203,9 @@ var AudioLevels = (function(my) {
if (resized) if (resized)
Object.keys(audioLevelCanvasCache).forEach(function (resourceJid) { Object.keys(audioLevelCanvasCache).forEach(function (resourceJid) {
audioLevelCanvasCache[resourceJid].width audioLevelCanvasCache[resourceJid].width
= width + CANVAS_EXTRA; = width + interfaceConfig.CANVAS_EXTRA;
audioLevelCanvasCache[resourceJid].height audioLevelCanvasCache[resourceJid].height
= height + CANVAS_EXTRA; = height + interfaceConfig.CANVAS_EXTRA;
}); });
}); });

7
index.html
View File

@ -26,6 +26,7 @@
<script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path --> <script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
<script src="interface_config.js?v=1"></script>
<script src="brand.js?v=1"></script> <script src="brand.js?v=1"></script>
<script src="muc.js?v=14"></script><!-- simple MUC library --> <script src="muc.js?v=14"></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 -->
@ -44,11 +45,11 @@
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<script src="rtp_sts.js?v=1"></script><!-- RTP stats processing --> <script src="rtp_sts.js?v=1"></script><!-- RTP stats processing -->
<script src="local_sts.js?v=1"></script><!-- Local stats processing --> <script src="local_sts.js?v=1"></script><!-- Local stats processing -->
<script src="videolayout.js?v=9"></script><!-- video ui --> <script src="videolayout.js?v=10"></script><!-- video ui -->
<script src="toolbar.js?v=6"></script><!-- toolbar ui --> <script src="toolbar.js?v=6"></script><!-- toolbar ui -->
<script src="toolbar_toggler.js?v=1"></script> <script src="toolbar_toggler.js?v=2"></script>
<script src="canvas_util.js?v=1"></script><!-- canvas drawing utils --> <script src="canvas_util.js?v=1"></script><!-- canvas drawing utils -->
<script src="audio_levels.js?v=1"></script><!-- audio levels plugin --> <script src="audio_levels.js?v=2"></script><!-- audio levels plugin -->
<script src="media_stream.js?v=1"></script><!-- media stream --> <script src="media_stream.js?v=1"></script><!-- media stream -->
<script src="bottom_toolbar.js?v=2"></script><!-- media stream --> <script src="bottom_toolbar.js?v=2"></script><!-- media stream -->
<script src="roomname_generator.js?v=1"></script><!-- generator for random room names --> <script src="roomname_generator.js?v=1"></script><!-- generator for random room names -->

9
interface_config.js Normal file
View File

@ -0,0 +1,9 @@
var interfaceConfig = {
CANVAS_EXTRA: 104,
CANVAS_RADIUS: 7,
SHADOW_COLOR: '#00ccff',
INITIAL_TOOLBAR_TIMEOUT: 20000,
TOOLBAR_TIMEOUT: 4000,
DEFAULT_REMOTE_DISPLAY_NAME: "Fellow Jitster",
DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME: "Speaker"
};

29
toolbar_toggler.js
View File

@ -1,7 +1,6 @@
var ToolbarToggler = (function(my) { var ToolbarToggler = (function(my) {
var INITIAL_TOOLBAR_TIMEOUT = 20000; var toolbarTimeoutObject,
var TOOLBAR_TIMEOUT = INITIAL_TOOLBAR_TIMEOUT; toolbarTimeout = interfaceConfig.INITIAL_TOOLBAR_TIMEOUT;
var toolbarTimeout;
/** /**
* Shows the main toolbar. * Shows the main toolbar.
@ -16,12 +15,12 @@ var ToolbarToggler = (function(my) {
bottomToolbar.show("slide", {direction: "right",duration: 300}); bottomToolbar.show("slide", {direction: "right",duration: 300});
} }
if (toolbarTimeout) { if (toolbarTimeoutObject) {
clearTimeout(toolbarTimeout); clearTimeout(toolbarTimeoutObject);
toolbarTimeout = null; toolbarTimeoutObject = null;
} }
toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT); toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
TOOLBAR_TIMEOUT = 4000; toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
} }
if (focus != null) if (focus != null)
@ -51,8 +50,8 @@ var ToolbarToggler = (function(my) {
isToolbarHover = true; isToolbarHover = true;
} }
clearTimeout(toolbarTimeout); clearTimeout(toolbarTimeoutObject);
toolbarTimeout = null; toolbarTimeoutObject = null;
if (!isToolbarHover) { if (!isToolbarHover) {
header.hide("slide", { direction: "up", duration: 300}); header.hide("slide", { direction: "up", duration: 300});
@ -62,7 +61,7 @@ var ToolbarToggler = (function(my) {
} }
} }
else { else {
toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT); toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
} }
}; };
@ -80,9 +79,9 @@ var ToolbarToggler = (function(my) {
} }
// Then clear the time out, to dock the toolbar. // Then clear the time out, to dock the toolbar.
if (toolbarTimeout) { if (toolbarTimeoutObject) {
clearTimeout(toolbarTimeout); clearTimeout(toolbarTimeoutObject);
toolbarTimeout = null; toolbarTimeoutObject = null;
} }
} }
else { else {
@ -90,7 +89,7 @@ var ToolbarToggler = (function(my) {
ToolbarToggler.showToolbar(); ToolbarToggler.showToolbar();
} }
else { else {
toolbarTimeout = setTimeout(hideToolbar, TOOLBAR_TIMEOUT); toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
} }
} }
}; };

15
videolayout.js
View File

@ -1,8 +1,6 @@
var VideoLayout = (function (my) { var VideoLayout = (function (my) {
var preMuted = false; var preMuted = false;
var currentDominantSpeaker = null; var currentDominantSpeaker = null;
var defaultRemoteDisplayName = "Fellow Jitster";
var defaultDominantSpeakerDisplayName = "Speaker";
var lastNCount = config.channelLastN; var lastNCount = config.channelLastN;
var lastNEndpointsCache = []; var lastNEndpointsCache = [];
var largeVideoNewSrc = ''; var largeVideoNewSrc = '';
@ -529,7 +527,7 @@ var VideoLayout = (function (my) {
if (displayName && displayName.length > 0) if (displayName && displayName.length > 0)
$('#' + videoSpanId + '_name').text(displayName); $('#' + videoSpanId + '_name').text(displayName);
else else
$('#' + videoSpanId + '_name').text(defaultRemoteDisplayName); $('#' + videoSpanId + '_name').text(interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME);
} }
} else { } else {
var editButton = null; var editButton = null;
@ -543,7 +541,7 @@ var VideoLayout = (function (my) {
nameSpan.innerText = defaultLocalDisplayName; nameSpan.innerText = defaultLocalDisplayName;
} }
else { else {
nameSpan.innerText = defaultRemoteDisplayName; nameSpan.innerText = interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME;
} }
if (displayName && displayName.length > 0) { if (displayName && displayName.length > 0) {
@ -1200,11 +1198,14 @@ var VideoLayout = (function (my) {
if (resourceJid !== currentDominantSpeaker) { if (resourceJid !== currentDominantSpeaker) {
var oldSpeakerVideoSpanId = "participant_" + currentDominantSpeaker, var oldSpeakerVideoSpanId = "participant_" + currentDominantSpeaker,
newSpeakerVideoSpanId = "participant_" + resourceJid; newSpeakerVideoSpanId = "participant_" + resourceJid;
if($("#" + oldSpeakerVideoSpanId + ">span.displayname").text() === defaultDominantSpeakerDisplayName) { if($("#" + oldSpeakerVideoSpanId + ">span.displayname").text() ===
interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME) {
setDisplayName(oldSpeakerVideoSpanId, null); setDisplayName(oldSpeakerVideoSpanId, null);
} }
if($("#" + newSpeakerVideoSpanId + ">span.displayname").text() === defaultRemoteDisplayName) { if($("#" + newSpeakerVideoSpanId + ">span.displayname").text() ===
setDisplayName(newSpeakerVideoSpanId, defaultDominantSpeakerDisplayName); interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME) {
setDisplayName(newSpeakerVideoSpanId,
interfaceConfig.DEFAULT_DOMINANT_SPEAKER_DISPLAY_NAME);
} }
currentDominantSpeaker = resourceJid; currentDominantSpeaker = resourceJid;
} else { } else {