seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:jamkazam/jam-web

This commit is contained in:
Brian Smith 2013-02-27 21:37:34 -05:00
parent f56d6d322d 5f67bf9234
commit ded9045cf9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/AAB_message_factory.js
View File

@ -69,7 +69,10 @@
// create a login message using token (a cookie or similiar)
factory.login_with_token = function(token) {
var login = { token : token };
//context.JK.logger.debug("*** login_with_token: client_id = "+$.cookie("client_id"));
var login = { token : token,
client_id : $.cookie("client_id")
};
return client_container(msg.LOGIN, route_to.SERVER, login);
};

1
app/assets/javascripts/jamkazam.js
View File

@ -51,6 +51,7 @@
function loggedIn(header, payload) {
app.clientId = payload.client_id;
$.cookie('client_id', payload.client_id);
var heartbeatMS = payload.heartbeat_interval * 1000;
logger.debug("jamkazam.js.loggedIn(): clientId now " + app.clientId + "; Setting up heartbeat every " + heartbeatMS + " MS");
heartbeatInterval = context.setInterval(_heartbeat, heartbeatMS);