This commit is contained in:
unkelpehr 2014-09-27 14:56:57 +02:00
parent cb37d41502
commit e221e9b662
3 changed files with 53 additions and 43 deletions

View File

@ -210,7 +210,7 @@ define({
// Connect events
for (var commandName in commands) {
if (commandName === '_require' && commandName !== 'post') {
if (commandName !== '_require' && commandName !== 'post') {
mediator.on('console:' + commandName, commands[commandName]);
}
}

View File

@ -8,48 +8,60 @@ define({
var mediator = requires.castrato;
// Route mediator messages
mediator.on('window:focused',function() {
mediator.emit('audio:off');
mediator.emit('notification:off');
});
mediator
.on('window:focused', function() {
mediator.emit('audio:off');
mediator.emit('notification:off');
})
.on('window:blurred',function() {
mediator.emit('audio:on');
mediator.emit('notification:on');
})
.on('command:mute', function () {
mediator.emit('audio:mute');
})
.on('command:unmute', function () {
mediator.emit('audio:unmute');
})
mediator.on('window:blurred',function() {
mediator.emit('audio:on');
mediator.emit('notification:on');
});
// Help console and host keep track of current states
.on('room:changed', function(room) {
mediator
.emit('console:param', {
room: room
})
.emit('host:param', {
room: room
});
})
.on('nick:changed', function(nick) {
mediator.emit('console:param', {
nick: nick
});
})
.on('key:changed', function(key) {
mediator
.emit('console:param', {
key: key
})
.emit('host:param', {
key: key
});
})
mediator.on('command:mute', function () { mediator.emit('audio:mute'); } );
mediator.on('command:unmute', function () { mediator.emit('audio:unmute'); } );
// Connect to the default host
.emit('command:connect', undefined, function() {
// Join room and set key if a hash in the format #Room:Key has been provided
if ((hash = window.location.hash)) {
parts = hash.slice(1).split(':');
// Help console and host keep track of current states
mediator.on('room:changed', function(room) {
mediator.emit('console:param',{ room: room});
mediator.emit('host:param',{ room: room});
});
if (parts[0]) {
mediator.emit('command:join', parts[0]);
}
mediator.on('nick:changed', function(nick) {
mediator.emit('console:param',{ nick: nick});
});
mediator.on('key:changed', function(key) {
mediator.emit('console:param',{ key: key});
mediator.emit('host:param',{ key: key});
});
// Connect to the default host
mediator.emit('command:connect', undefined, function() {
// Join room and set key if a hash in the format #Room:Key has been provided
if ((hash = window.location.hash)) {
parts = hash.slice(1).split(':');
if (parts[0]) {
mediator.emit('command:join', parts[0]);
if (parts[1]) {
mediator.emit('command:key', parts[1]);
}
}
if (parts[1]) {
mediator.emit('command:key', parts[1]);
}
}
});
});
});

View File

@ -261,6 +261,4 @@ define(
mediator.on('socket:emit', emit);
mediator.on('host:param', param);
});