mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Hacks to make sure we don't end up with multiple split-brain CallHandlers when npm linked.

Browse source
This commit is contained in:
David Baker 2015-09-30 18:21:25 +01:00
parent b68665ead5
commit cb89d3760a
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/CallHandler.js
View file

@ -58,9 +58,10 @@ var Matrix = require("matrix-js-sdk");
var dis = require("./dispatcher"); var dis = require("./dispatcher");
var Modulator = require("./Modulator"); var Modulator = require("./Modulator");
var calls = { global.mxCalls = {
//room_id: MatrixCall //room_id: MatrixCall
}; };
var calls = global.mxCalls;
function play(audioId) { function play(audioId) {
// TODO: Attach an invisible element for this instead // TODO: Attach an invisible element for this instead
@ -149,7 +150,7 @@ function _setCallState(call, roomId, status) {
}); });
} }
dis.register(function(payload) { function _onAction(payload) {
function placeCall(newCall) { function placeCall(newCall) {
_setCallListeners(newCall); _setCallListeners(newCall);
_setCallState(newCall, newCall.roomId, "ringback"); _setCallState(newCall, newCall.roomId, "ringback");
@ -217,10 +218,9 @@ dis.register(function(payload) {
}); });
} else { } else {
var ConferenceHandler = Modulator.getConferenceHandler(); var ConferenceHandler = Modulator.getConferenceHandler();
var confCall = ConferenceHandler.createNewMatrixCall( ConferenceHandler.createNewMatrixCall(
MatrixClientPeg.get(), payload.room_id MatrixClientPeg.get(), payload.room_id
); ).done(function(call) {
confCall.setup().done(function(call) {
placeCall(call); placeCall(call);
}, function(err) { }, function(err) {
console.error("Failed to setup conference call: %s", err); console.error("Failed to setup conference call: %s", err);
@ -255,10 +255,14 @@ dis.register(function(payload) {
}); });
break; break;
} }
}); }
// FIXME: Nasty way of making sure we only register
module.exports = { // with the dispatcher once
if (!global.mxCallHandler) {
dis.register(_onAction);
}
var callHandler = {
getCallForRoom: function(roomId) { getCallForRoom: function(roomId) {
return ( return (
module.exports.getCall(roomId) module.exports.getCall(roomId)
@ -280,3 +284,12 @@ module.exports = {
return null; return null;
} }
}; };
// Only things in here which actually need to be global are the
// calls list (done separately) and making sure we only register
// with the dispatcher once (which uses this mechanism but checks
// separately). This could be tidied up.
if (global.mxCallHandler === undefined) {
global.mxCallHandler = callHandler;
}
module.exports = global.mxCallHandler;