KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added so channel of sender is on title of sender

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-13 12:39:31 +02:00
parent b75a176fb8
commit f9e65a5ab9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/server.js
View File

@@ -46,7 +46,7 @@ io.on('connection', function(socket){
{ {
check_inlist(coll, guid, socket); check_inlist(coll, guid, socket);
if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length) if(data != "" && data !== undefined && data !== null && data.length < 151 && data.replace(/\s/g, '').length)
io.sockets.emit('chat.all', rndName(guid) + ": " + data); io.sockets.emit('chat.all', [rndName(guid) + ": " + data, coll]);
}); });
socket.on('frontpage_lists', function() socket.on('frontpage_lists', function()

6
static/js/chat.js
View File

@@ -29,8 +29,10 @@ $(".chat-tab").click(function(){
$("#text-chat-input").focus(); $("#text-chat-input").focus();
}); });
socket.on("chat.all", function(data) socket.on("chat.all", function(inp)
{ {
data = inp[0];
if($("#chat-bar").position()["left"] != 0) if($("#chat-bar").position()["left"] != 0)
{ {
//$("#chat-btn").css("color", "grey"); //$("#chat-btn").css("color", "grey");
@@ -47,7 +49,7 @@ socket.on("chat.all", function(data)
unseen = true; unseen = true;
} }
var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6); var color = intToARGB(hashCode(data.substring(0,8))).substring(0,6);
$("#chatall").append("<li><span style='color:"+color+";'>"+data.substring(0,8)+"</span></li>"); $("#chatall").append("<li title='"+inp[1]+"'><span style='color:"+color+";'>"+data.substring(0,8)+"</span></li>");
var in_text = document.createTextNode(data.substring(8)); var in_text = document.createTextNode(data.substring(8));
$("#chatall li:last")[0].appendChild(in_text); $("#chatall li:last")[0].appendChild(in_text);
document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight