diff --git a/app/assets/javascripts/JamServer.js b/app/assets/javascripts/JamServer.js index 25230ef25..0c7bac3cd 100644 --- a/app/assets/javascripts/JamServer.js +++ b/app/assets/javascripts/JamServer.js @@ -1,3 +1,7 @@ +// TODO: Rename? This is really only the websocket/messaging +// part of the server (none of the REST calls go through this). +// perhaps something like RealTimeMessages or something... +// // The wrapper around the web-socket connection to the server (function(context, $) { var server = {}; diff --git a/app/assets/javascripts/createSession.js b/app/assets/javascripts/createSession.js index 175813407..a85dc8c40 100644 --- a/app/assets/javascripts/createSession.js +++ b/app/assets/javascripts/createSession.js @@ -3,6 +3,22 @@ context.JK = context.JK || {}; context.JK.CreateSessionScreen = function(app) { var logger = context.JK.logger; + var realtimeMessaging = context.JK.JamServer; + +/* +Message from Seth on sequence for creating/joining sessions: +02:31:46 PM) Seth Call: sequence: +(02:31:53 PM) Seth Call: LOGIN websocket (get your client_id) +(02:32:02 PM) Seth Call: CRETAE SESSION +(02:32:09 PM) Seth Call: CREATE PARTICIPANT (pass in client_id) +(02:32:12 PM) Seth Call: that's it for client 1 +(02:32:13 PM) Seth Call: client 2 +(02:32:20 PM) Seth Call: LOGIN WEBSOCKET (get your client_id) +(02:32:29 PM) Seth Call: CREATE PARTICIPANT(pass in client_id for client2) +(02:32:31 PM) Seth Call: that's it +(02:32:43 PM) Seth Call: USER_JOINED_MUSIC_SESSION is an event from the server +(02:32:52 PM) Seth Call: and LOGIN_MUSIC_SESSION is deprecated/junk +*/ function afterShow(data) {} diff --git a/app/assets/javascripts/messaging.js b/app/assets/javascripts/messaging.js index 9688f7500..4f804a13f 100644 --- a/app/assets/javascripts/messaging.js +++ b/app/assets/javascripts/messaging.js @@ -54,7 +54,7 @@ */ this.register = function() { for (var message in messages) { - logger.debug("registering " + message); + logger.debug("registering logger.debug: " + message); context.JamServer.registerMessageCallback(message, logMessage); }