From ade0928bdc3aebc73c7e7b7822891f49bd21c658 Mon Sep 17 00:00:00 2001 From: Jonathon Wilson Date: Sun, 14 Oct 2012 10:56:09 -0600 Subject: [PATCH] Change 'target' to 'route_to' in websocket messages --- app/assets/javascripts/JamServer.js | 1 - app/assets/javascripts/message_factory.js | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/JamServer.js b/app/assets/javascripts/JamServer.js index 18081196b..25230ef25 100644 --- a/app/assets/javascripts/JamServer.js +++ b/app/assets/javascripts/JamServer.js @@ -77,7 +77,6 @@ }; server.onClose = function() { - logger.log('server.onClose'); logger.log("Socket to server closed."); // TODO: reconnect }; diff --git a/app/assets/javascripts/message_factory.js b/app/assets/javascripts/message_factory.js index 05f536ac7..663943e97 100644 --- a/app/assets/javascripts/message_factory.js +++ b/app/assets/javascripts/message_factory.js @@ -7,6 +7,7 @@ var SERVER_TARGET = "server"; var SESSION_TARGET_PREFIX = "session:"; var USER_TARGET_PREFIX = "user:"; + var CLIENT_TARGET_PREFIX = "client:"; var msg = context.Messages = { LOGIN : "LOGIN", @@ -26,26 +27,26 @@ function client_container(type, target, inner) { var type_field = type.toLowerCase(); - var body = { "type" : type, "target" : target}; + var body = { "type" : type, "route_to" : target}; body[type_field] = inner; return body; } // create a login message using user/pass message_factory.login_with_user_pass = function(username, password) { - login = { username : username , password : password}; + var login = { username : username , password : password }; return client_container(msg.LOGIN, SERVER_TARGET, login); }; // create a login message using token (a cookie or similiar) message_factory.login_with_token = function(token) { - login = { token : token}; + var login = { token : token }; return client_container(msg.LOGIN, SERVER_TARGET, login); }; // create a music session login message message_factory.login_music_session = function(music_session) { - login_music_session = { music_session : music_session }; + var login_music_session = { music_session : music_session }; return client_container(msg.LOGIN_MUSIC_SESSION, SERVER_TARGET, login_music_session); };