Claytonia/cryptalk
Claytonia/cryptalk
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bughunt

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/cryptalk_modules/console.js
View file

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

52
public/js/cryptalk_modules/cryptalk.js
View file

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

2
public/js/cryptalk_modules/host.js
View file

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