Index: lams_tool_chat/web/includes/javascript/learning.js =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/includes/javascript/learning.js,v diff -u -r1.15.2.1 -r1.15.2.2 --- lams_tool_chat/web/includes/javascript/learning.js 22 Jan 2016 10:50:25 -0000 1.15.2.1 +++ lams_tool_chat/web/includes/javascript/learning.js 7 Nov 2016 13:21:04 -0000 1.15.2.2 @@ -10,7 +10,7 @@ sendMessageArea.keydown(function(e) { if (e.which == 13) { e.preventDefault(); - sendMessage(); + sendChatToolMessage(); } }); }); @@ -21,9 +21,9 @@ // only Monitor can send a personal message selectedUser = null, // init the connection with server using server URL but with different protocol - websocket = new WebSocket(APP_URL.replace('http', 'ws') + 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID); + chatToolWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID); -websocket.onmessage = function(e){ +chatToolWebsocket.onmessage = function(e){ // create JSON object var input = JSON.parse(e.data); // clear old messages @@ -65,7 +65,7 @@ }); } -websocket.onerror = function(e){ +chatToolWebsocket.onerror = function(e){ alert("Error estabilishing connection to server: " + e.data); } @@ -84,7 +84,7 @@ userDiv.attr('class', selectedUser ? 'selected' : 'unselected'); } -function sendMessage() { +function sendChatToolMessage() { var message = sendMessageArea.val(); if (!message || message == '') { return false; // do not send empty messages. @@ -100,7 +100,7 @@ }; // send it to server - websocket.send(JSON.stringify(output)); + chatToolWebsocket.send(JSON.stringify(output)); } function getColour(nick) {