From 9b188495445fd5b99f538a60664d346abc25b4cf Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 28 Apr 2014 19:47:24 +0000 Subject: [PATCH] * working on feature ftue --- web/app/assets/javascripts/JamServer.js | 8 +++++--- web/vendor/assets/javascripts/jquery.icheck.js | 2 ++ websocket-gateway/lib/jam_websockets/router.rb | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/app/assets/javascripts/JamServer.js b/web/app/assets/javascripts/JamServer.js index 44321fd23..a407453db 100644 --- a/web/app/assets/javascripts/JamServer.js +++ b/web/app/assets/javascripts/JamServer.js @@ -156,9 +156,10 @@ // for debugging purposes, see if the last time we've sent a heartbeat is way off (500ms) of the target interval var now = new Date(); - if (lastHeartbeatSentTime) { + + if(lastHeartbeatSentTime) { var drift = new Date().getTime() - lastHeartbeatSentTime.getTime() - heartbeatMS; - if (drift > 500) { + if(drift > 500) { logger.error("significant drift between heartbeats: " + drift + 'ms beyond target interval') } } @@ -460,7 +461,8 @@ connectTimeout = setTimeout(function () { connectTimeout = null; - if (connectDeferred.state() === 'pending') { + + if(connectDeferred.state() === 'pending') { server.close(true); connectDeferred.reject(); } diff --git a/web/vendor/assets/javascripts/jquery.icheck.js b/web/vendor/assets/javascripts/jquery.icheck.js index ab4eed092..4e0cffeb9 100644 --- a/web/vendor/assets/javascripts/jquery.icheck.js +++ b/web/vendor/assets/javascripts/jquery.icheck.js @@ -285,10 +285,12 @@ // Check, disable or indeterminate if (/^(ch|di|in)/.test(method) && !active) { + console.log("TAKING ROUTE: ", state); on(input, state); // Uncheck, enable or determinate } else if (/^(un|en|de)/.test(method) && active) { + console.log("TAKING ROUTE2: ", state); off(input, state); // Update diff --git a/websocket-gateway/lib/jam_websockets/router.rb b/websocket-gateway/lib/jam_websockets/router.rb index 8ee1cab67..153738ad0 100644 --- a/websocket-gateway/lib/jam_websockets/router.rb +++ b/websocket-gateway/lib/jam_websockets/router.rb @@ -393,6 +393,7 @@ module JamWebsockets @log.debug "cleaned up not-logged-in client #{client}" else @log.debug "cleanup up logged-in client #{client}" + context = @clients.delete(client) if context