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

Minor formatting fixes, avoid using a global variable.

This commit is contained in:
Boris Grozev 2015-07-28 13:22:11 -05:00
parent 35e46a2cfa
commit fd5a739f3c
8 changed files with 70 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
external_api.js
View File

@ -25,16 +25,15 @@ var JitsiMeetExternalAPI = (function()
* @param parent_node the node that will contain the iframe * @param parent_node the node that will contain the iframe
* @constructor * @constructor
*/ */
function JitsiMeetExternalAPI(domain, room_name, width, height, parent_node) function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode) {
{
if(!width || width < MIN_WIDTH) if(!width || width < MIN_WIDTH)
width = MIN_WIDTH; width = MIN_WIDTH;
if(!height || height < MIN_HEIGHT) if(!height || height < MIN_HEIGHT)
height = MIN_HEIGHT; height = MIN_HEIGHT;
this.parentNode = null; this.parentNode = null;
if(parent_node) { if (parentNode) {
this.parentNode = parent_node; this.parentNode = parentNode;
} else { } else {
var scriptTag = document.scripts[document.scripts.length - 1]; var scriptTag = document.scripts[document.scripts.length - 1];
this.parentNode = scriptTag.parentNode; this.parentNode = scriptTag.parentNode;
@ -78,15 +77,12 @@ var JitsiMeetExternalAPI = (function()
* Sends the passed object to Jitsi Meet * Sends the passed object to Jitsi Meet
* @param object the object to be sent * @param object the object to be sent
*/ */
JitsiMeetExternalAPI.prototype.sendMessage = function(object) JitsiMeetExternalAPI.prototype.sendMessage = function(object) {
{ if (this.frameLoaded) {
if(this.frameLoaded)
{
this.frame.contentWindow.postMessage( this.frame.contentWindow.postMessage(
JSON.stringify(object), this.frame.src); JSON.stringify(object), this.frame.src);
} }
else else {
{
this.initialCommands.push(object); this.initialCommands.push(object);
} }
@ -105,10 +101,9 @@ var JitsiMeetExternalAPI = (function()
* @param arguments array of arguments * @param arguments array of arguments
*/ */
JitsiMeetExternalAPI.prototype.executeCommand = function(name, JitsiMeetExternalAPI.prototype.executeCommand = function(name,
argumentsList) argumentsList) {
{
var argumentsArray = argumentsList; var argumentsArray = argumentsList;
if(!argumentsArray) if (!argumentsArray)
argumentsArray = []; argumentsArray = [];
var object = {type: "command", action: "execute"}; var object = {type: "command", action: "execute"};
object[name] = argumentsArray; object[name] = argumentsArray;
@ -133,8 +128,8 @@ var JitsiMeetExternalAPI = (function()
}; };
/** /**
* Adds event listeners to Meet Jitsi. The object key should be the name of the * Adds event listeners to Meet Jitsi. The object key should be the name of
* event and value - the listener. * the event and value - the listener.
* Currently we support the following * Currently we support the following
* events: * events:
* incomingMessage - receives event notifications about incoming * incomingMessage - receives event notifications about incoming
@ -168,8 +163,7 @@ var JitsiMeetExternalAPI = (function()
* @param object * @param object
*/ */
JitsiMeetExternalAPI.prototype.addEventListeners JitsiMeetExternalAPI.prototype.addEventListeners
= function (object) = function (object) {
{
var message = {type: "event", action: "add", events: []}; var message = {type: "event", action: "add", events: []};
for(var i in object) for(var i in object)
@ -215,8 +209,7 @@ var JitsiMeetExternalAPI = (function()
* @param listener the listener * @param listener the listener
*/ */
JitsiMeetExternalAPI.prototype.addEventListener JitsiMeetExternalAPI.prototype.addEventListener
= function (event, listener) = function (event, listener) {
{
var message = {type: "event", action: "add", events: [event]}; var message = {type: "event", action: "add", events: [event]};
this.eventHandlers[event] = listener; this.eventHandlers[event] = listener;
@ -228,8 +221,7 @@ var JitsiMeetExternalAPI = (function()
* @param event the name of the event. * @param event the name of the event.
*/ */
JitsiMeetExternalAPI.prototype.removeEventListener JitsiMeetExternalAPI.prototype.removeEventListener
= function (event) = function (event) {
{
if(!this.eventHandlers[event]) if(!this.eventHandlers[event])
{ {
console.error("The event " + event + " is not registered."); console.error("The event " + event + " is not registered.");
@ -245,8 +237,7 @@ var JitsiMeetExternalAPI = (function()
* @param events array with the names of the events. * @param events array with the names of the events.
*/ */
JitsiMeetExternalAPI.prototype.removeEventListeners JitsiMeetExternalAPI.prototype.removeEventListeners
= function (events) = function (events) {
{
var eventsArray = []; var eventsArray = [];
for(var i = 0; i < events.length; i++) for(var i = 0; i < events.length; i++)
{ {
@ -272,8 +263,7 @@ var JitsiMeetExternalAPI = (function()
* Processes message events sent from Jitsi Meet * Processes message events sent from Jitsi Meet
* @param event the event * @param event the event
*/ */
JitsiMeetExternalAPI.prototype.processMessage = function(event) JitsiMeetExternalAPI.prototype.processMessage = function(event) {
{
var message; var message;
try { try {
message = JSON.parse(event.data); message = JSON.parse(event.data);
@ -283,18 +273,15 @@ var JitsiMeetExternalAPI = (function()
console.error("Message without type is received."); console.error("Message without type is received.");
return; return;
} }
switch (message.type) switch (message.type) {
{
case "system": case "system":
if(message.loaded) if(message.loaded) {
{
this.onFrameLoaded(); this.onFrameLoaded();
} }
break; break;
case "event": case "event":
if(message.action != "result" || if(message.action != "result" ||
!message.event || !this.eventHandlers[message.event]) !message.event || !this.eventHandlers[message.event]) {
{
console.warn("The received event cannot be parsed."); console.warn("The received event cannot be parsed.");
return; return;
} }
@ -304,8 +291,6 @@ var JitsiMeetExternalAPI = (function()
console.error("Unknown message type."); console.error("Unknown message type.");
return; return;
} }
}; };
/** /**
@ -314,8 +299,7 @@ var JitsiMeetExternalAPI = (function()
*/ */
JitsiMeetExternalAPI.prototype.onFrameLoaded = function () { JitsiMeetExternalAPI.prototype.onFrameLoaded = function () {
this.frameLoaded = true; this.frameLoaded = true;
for (var i = 0; i < this.initialCommands.length; i++) for (var i = 0; i < this.initialCommands.length; i++) {
{
this.sendMessage(this.initialCommands[i]); this.sendMessage(this.initialCommands[i]);
} }
this.initialCommands = null; this.initialCommands = null;
@ -329,13 +313,11 @@ var JitsiMeetExternalAPI = (function()
this.eventListener = function (event) { this.eventListener = function (event) {
self.processMessage(event); self.processMessage(event);
}; };
if (window.addEventListener) if (window.addEventListener) {
{
window.addEventListener('message', window.addEventListener('message',
this.eventListener, false); this.eventListener, false);
} }
else else {
{
window.attachEvent('onmessage', this.eventListener); window.attachEvent('onmessage', this.eventListener);
} }
}; };
@ -344,13 +326,11 @@ var JitsiMeetExternalAPI = (function()
* Removes the listeners and removes the Jitsi Meet frame. * Removes the listeners and removes the Jitsi Meet frame.
*/ */
JitsiMeetExternalAPI.prototype.dispose = function () { JitsiMeetExternalAPI.prototype.dispose = function () {
if (window.removeEventListener) if (window.removeEventListener) {
{
window.removeEventListener('message', window.removeEventListener('message',
this.eventListener, false); this.eventListener, false);
} }
else else {
{
window.detachEvent('onmessage', window.detachEvent('onmessage',
this.eventListener); this.eventListener);
} }

61
modules/API/API.js
View File

@ -1,3 +1,4 @@
/* global APP */
/** /**
* Implements API class that communicates with external api class * Implements API class that communicates with external api class
* and provides interface to access Jitsi Meet features by external * and provides interface to access Jitsi Meet features by external
@ -12,14 +13,15 @@ var XMPPEvents = require("../../service/xmpp/XMPPEvents");
* displayName: inputDisplayNameHandler, * displayName: inputDisplayNameHandler,
* muteAudio: toggleAudio, * muteAudio: toggleAudio,
* muteVideo: toggleVideo, * muteVideo: toggleVideo,
* filmStrip: toggleFilmStrip * toggleFilmStrip: toggleFilmStrip,
* toggleChat: toggleChat,
* toggleContactList: toggleContactList
* }} * }}
*/ */
var commands = {}; var commands = {};
function initCommands() { function initCommands() {
commands = commands = {
{
displayName: APP.UI.inputDisplayNameHandler, displayName: APP.UI.inputDisplayNameHandler,
muteAudio: APP.UI.toggleAudio, muteAudio: APP.UI.toggleAudio,
muteVideo: APP.UI.toggleVideo, muteVideo: APP.UI.toggleVideo,
@ -41,8 +43,7 @@ function initCommands() {
* participantLeft: boolean * participantLeft: boolean
* }} * }}
*/ */
var events = var events = {
{
incomingMessage: false, incomingMessage: false,
outgoingMessage:false, outgoingMessage:false,
displayNameChange: false, displayNameChange: false,
@ -53,18 +54,15 @@ var events =
var displayName = {}; var displayName = {};
/** /**
* Processes commands from external applicaiton. * Processes commands from external application.
* @param message the object with the command * @param message the object with the command
*/ */
function processCommand(message) function processCommand(message) {
{ if (message.action != "execute") {
if(message.action != "execute")
{
console.error("Unknown action of the message"); console.error("Unknown action of the message");
return; return;
} }
for(var key in message) for (var key in message) {
{
if(commands[key]) if(commands[key])
commands[key].apply(null, message[key]); commands[key].apply(null, message[key]);
} }
@ -75,31 +73,26 @@ function processCommand(message)
* @param event the event * @param event the event
*/ */
function processEvent(event) { function processEvent(event) {
if(!event.action) if (!event.action) {
{
console.error("Event with no action is received."); console.error("Event with no action is received.");
return; return;
} }
var i = 0; var i = 0;
switch(event.action) switch(event.action) {
{
case "add": case "add":
for(; i < event.events.length; i++) for (; i < event.events.length; i++) {
{
events[event.events[i]] = true; events[event.events[i]] = true;
} }
break; break;
case "remove": case "remove":
for(; i < event.events.length; i++) for (; i < event.events.length; i++) {
{
events[event.events[i]] = false; events[event.events[i]] = false;
} }
break; break;
default: default:
console.error("Unknown action for event."); console.error("Unknown action for event.");
} }
} }
/** /**
@ -114,8 +107,7 @@ function sendMessage(object) {
* Processes a message event from the external application * Processes a message event from the external application
* @param event the message event * @param event the message event
*/ */
function processMessage(event) function processMessage(event) {
{
var message; var message;
try { try {
message = JSON.parse(event.data); message = JSON.parse(event.data);
@ -123,8 +115,7 @@ function processMessage(event)
if(!message.type) if(!message.type)
return; return;
switch (message.type) switch (message.type) {
{
case "command": case "command":
processCommand(message); processCommand(message);
break; break;
@ -135,7 +126,6 @@ function processMessage(event)
console.error("Unknown type of the message"); console.error("Unknown type of the message");
return; return;
} }
} }
function setupListeners() { function setupListeners() {
@ -151,7 +141,7 @@ function setupListeners() {
API.triggerEvent("participantLeft", {jid: jid}); API.triggerEvent("participantLeft", {jid: jid});
}); });
APP.xmpp.addListener(XMPPEvents.DISPLAY_NAME_CHANGED, function (jid, newDisplayName) { APP.xmpp.addListener(XMPPEvents.DISPLAY_NAME_CHANGED, function (jid, newDisplayName) {
name = displayName[jid]; var name = displayName[jid];
if(!name || name != newDisplayName) { if(!name || name != newDisplayName) {
API.triggerEvent("displayNameChange", {jid: jid, displayname: newDisplayName}); API.triggerEvent("displayNameChange", {jid: jid, displayname: newDisplayName});
displayName[jid] = newDisplayName; displayName[jid] = newDisplayName;
@ -169,7 +159,7 @@ var API = {
*/ */
isEnabled: function () { isEnabled: function () {
var hash = location.hash; var hash = location.hash;
if(hash && hash.indexOf("external") > -1 && window.postMessage) if (hash && hash.indexOf("external") > -1 && window.postMessage)
return true; return true;
return false; return false;
}, },
@ -181,13 +171,11 @@ var API = {
*/ */
init: function () { init: function () {
initCommands(); initCommands();
if (window.addEventListener) if (window.addEventListener) {
{
window.addEventListener('message', window.addEventListener('message',
processMessage, false); processMessage, false);
} }
else else {
{
window.attachEvent('onmessage', processMessage); window.attachEvent('onmessage', processMessage);
} }
sendMessage({type: "system", loaded: true}); sendMessage({type: "system", loaded: true});
@ -218,19 +206,14 @@ var API = {
* Removes the listeners. * Removes the listeners.
*/ */
dispose: function () { dispose: function () {
if(window.removeEventListener) if(window.removeEventListener) {
{
window.removeEventListener("message", window.removeEventListener("message",
processMessage, false); processMessage, false);
} }
else else {
{
window.detachEvent('onmessage', processMessage); window.detachEvent('onmessage', processMessage);
} }
} }
}; };
module.exports = API; module.exports = API;

11
modules/UI/UI.js
View File

@ -786,10 +786,13 @@ UI.getRoomName = function () {
}; };
UI.setInitialMuteFromFocus = function (muteAudio, muteVideo) { UI.setInitialMuteFromFocus = function (muteAudio, muteVideo) {
if(muteAudio || muteVideo) notifyForInitialMute(); if (muteAudio || muteVideo)
if(muteAudio) UI.setAudioMuted(true); notifyForInitialMute();
if(muteVideo) UI.setVideoMute(true); if (muteAudio)
} UI.setAudioMuted(true);
if (muteVideo)
UI.setVideoMute(true);
};
/** /**
* Mutes/unmutes the local video. * Mutes/unmutes the local video.

4
modules/connectionquality/connectionquality.js
View File

@ -1,3 +1,4 @@
/* global APP, require */
var EventEmitter = require("events"); var EventEmitter = require("events");
var eventEmitter = new EventEmitter(); var eventEmitter = new EventEmitter();
var CQEvents = require("../../service/connectionquality/CQEvents"); var CQEvents = require("../../service/connectionquality/CQEvents");
@ -53,7 +54,7 @@ function convertToMUCStats(stats) {
} }
/** /**
* Converts statitistics to format used by VideoLayout * Converts statistics to format used by VideoLayout
* @param stats * @param stats
* @returns {{bitrate: {download: *, upload: *}, packetLoss: {total: *, download: *, upload: *}}} * @returns {{bitrate: {download: *, upload: *}, packetLoss: {total: *, download: *, upload: *}}}
*/ */
@ -71,7 +72,6 @@ function parseMUCStats(stats) {
}; };
} }
var ConnectionQuality = { var ConnectionQuality = {
init: function () { init: function () {
APP.xmpp.addListener(XMPPEvents.REMOTE_STATS, this.updateRemoteStats); APP.xmpp.addListener(XMPPEvents.REMOTE_STATS, this.updateRemoteStats);

1
modules/keyboardshortcut/keyboardshortcut.js
View File

@ -1,3 +1,4 @@
/* global APP, $ */
//maps keycode to character, id of popover for given function and function //maps keycode to character, id of popover for given function and function
var shortcuts = {}; var shortcuts = {};
function initShortcutHandlers() { function initShortcutHandlers() {

9
modules/members/MemberList.js
View File

@ -1,4 +1,4 @@
/* global APP */ /* global APP, require, $ */
/** /**
* This module is meant to (eventually) contain and manage all information * This module is meant to (eventually) contain and manage all information
@ -87,7 +87,7 @@ function updateDtmf(jid, newValue) {
* Checks each member's 'supportsDtmf' field and updates * Checks each member's 'supportsDtmf' field and updates
* 'atLastOneSupportsDtmf'. * 'atLastOneSupportsDtmf'.
*/ */
function updateAtLeastOneDtmf(){ function updateAtLeastOneDtmf() {
var newAtLeastOneDtmf = false; var newAtLeastOneDtmf = false;
for (var key in members) { for (var key in members) {
if (typeof members[key].supportsDtmf !== 'undefined' if (typeof members[key].supportsDtmf !== 'undefined'
@ -108,11 +108,10 @@ function updateAtLeastOneDtmf(){
* Exported interface. * Exported interface.
*/ */
var Members = { var Members = {
start: function(){ start: function() {
registerListeners(); registerListeners();
}, },
addListener: function(type, listener) addListener: function(type, listener) {
{
eventEmitter.on(type, listener); eventEmitter.on(type, listener);
}, },
removeListener: function (type, listener) { removeListener: function (type, listener) {

6
modules/settings/Settings.js
View File

@ -35,15 +35,13 @@ if (supportsLocalStorage()) {
userId = generateUniqueId(); userId = generateUniqueId();
} }
var Settings = var Settings = {
{
setDisplayName: function (newDisplayName) { setDisplayName: function (newDisplayName) {
displayName = newDisplayName; displayName = newDisplayName;
window.localStorage.displayname = displayName; window.localStorage.displayname = displayName;
return displayName; return displayName;
}, },
setEmail: function (newEmail) setEmail: function (newEmail) {
{
email = newEmail; email = newEmail;
window.localStorage.email = newEmail; window.localStorage.email = newEmail;
return email; return email;

17
modules/statistics/CallStats.js
View File

@ -1,3 +1,4 @@
/* global config, $, APP, Strophe, callstats */
var callStats = null; var callStats = null;
function initCallback (err, msg) { function initCallback (err, msg) {
@ -38,37 +39,37 @@ var CallStats = {
this.pcCallback.bind(this)); this.pcCallback.bind(this));
}, },
pcCallback: function (err, msg) { pcCallback: function (err, msg) {
if(!callStats) if (!callStats)
return; return;
console.log("Monitoring status: "+ err + " msg: " + msg); console.log("Monitoring status: "+ err + " msg: " + msg);
callStats.sendFabricEvent(this.peerconnection, callStats.sendFabricEvent(this.peerconnection,
callStats.fabricEvent.fabricSetup, this.confID); callStats.fabricEvent.fabricSetup, this.confID);
}, },
sendMuteEvent: function (mute, type) { sendMuteEvent: function (mute, type) {
if(!callStats) if (!callStats)
return; return;
var event = null; var event = null;
if(type === "video") if (type === "video") {
{
event = (mute? callStats.fabricEvent.videoPause : event = (mute? callStats.fabricEvent.videoPause :
callStats.fabricEvent.videoResume); callStats.fabricEvent.videoResume);
} }
else else {
{
event = (mute? callStats.fabricEvent.audioMute : event = (mute? callStats.fabricEvent.audioMute :
callStats.fabricEvent.audioUnmute); callStats.fabricEvent.audioUnmute);
} }
callStats.sendFabricEvent(this.peerconnection, event, this.confID); callStats.sendFabricEvent(this.peerconnection, event, this.confID);
}, },
sendTerminateEvent: function () { sendTerminateEvent: function () {
if(!callStats) if(!callStats) {
return; return;
}
callStats.sendFabricEvent(this.peerconnection, callStats.sendFabricEvent(this.peerconnection,
callStats.fabricEvent.fabricTerminated, this.confID); callStats.fabricEvent.fabricTerminated, this.confID);
}, },
sendSetupFailedEvent: function () { sendSetupFailedEvent: function () {
if(!callStats) if(!callStats) {
return; return;
}
callStats.sendFabricEvent(this.peerconnection, callStats.sendFabricEvent(this.peerconnection,
callStats.fabricEvent.fabricSetupFailed, this.confID); callStats.fabricEvent.fabricSetupFailed, this.confID);
} }