diff --git a/app/assets/javascripts/JamServer.js b/app/assets/javascripts/JamServer.js index 749a066e0..8ed816194 100644 --- a/app/assets/javascripts/JamServer.js +++ b/app/assets/javascripts/JamServer.js @@ -94,14 +94,21 @@ }; server.send = function(message) { - var jsMessage = JSON.stringify(message); - logger.log("server.send(" + jsMessage + ")"); - if (server !== undefined && server.socket !== undefined && server.socket.send !== undefined) { - server.socket.send(jsMessage); - } else { - logger.log("Dropped message because server connection is closed."); - } + var jsMessage = JSON.stringify(message); + + // make sure we're connected before sending + if (context.jamClient.connected) { + logger.log("server.send(" + jsMessage + ")"); + if (server !== undefined && server.socket !== undefined && server.socket.send !== undefined) { + server.socket.send(jsMessage); + } else { + logger.log("Dropped message because server connection is closed."); + } + } + else { + logger.log("Could not send " + jsMessage + " since we're not connected yet."); + } }; server.loginSession = function(sessionId) { diff --git a/app/assets/javascripts/findSession.js b/app/assets/javascripts/findSession.js index b50a555b9..183e2a1a0 100644 --- a/app/assets/javascripts/findSession.js +++ b/app/assets/javascripts/findSession.js @@ -283,18 +283,6 @@ $('table#sessions-friends').children(':not(:first-child)').remove(); $('table#sessions-other').children(':not(:first-child)').remove(); - // sessions = null; - // sessions = {}; - - // invitationSessionGroup = null; - // invitationSessionGroup = {}; - - // friendSessionGroup = null; - // friendSessionGroup = {}; - - // otherSessionGroup = null; - // otherSessionGroup = {}; - sessionCounts = [0, 0, 0]; }