Index: lams_learning/web/includes/javascript/presence.js =================================================================== diff -u -r88272da28c18de62ade94eafc89f974ef50c3b29 -r83811002f3d39ce647ddfe30f9371ad10bd499af --- lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision 88272da28c18de62ade94eafc89f974ef50c3b29) +++ lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision 83811002f3d39ce647ddfe30f9371ad10bd499af) @@ -92,11 +92,11 @@ }, // init the connection with server using server URL but with different protocol - websocket = new WebSocket(APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId + + presenceWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId + '&imEnabled=' + presenceImEnabled + '&nickname=' + encodeURIComponent(nickname)); // when the server pushes new messages and roster to the learner's browser -websocket.onmessage = function(e){ +presenceWebsocket.onmessage = function(e){ // create JSON object var input = JSON.parse(e.data); if (input.roster) { @@ -212,7 +212,7 @@ 'to' : nick }; - websocket.send(JSON.stringify(data)); + presenceWebsocket.send(JSON.stringify(data)); return tab; } @@ -274,7 +274,7 @@ 'message' : message }; - websocket.send(JSON.stringify(data)); + presenceWebsocket.send(JSON.stringify(data)); } /* ******* Click handlers ******* */