From f9e65a5ab9c386d954503141d18667f46ede173d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 13 May 2015 12:39:31 +0200
Subject: [PATCH] Added so channel of sender is on title of sender

---
 server/server.js  | 2 +-
 static/js/chat.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/server.js b/server/server.js
index 14dd3a49..652d5eca 100755
--- a/server/server.js
+++ b/server/server.js
@@ -46,7 +46,7 @@ io.on('connection', function(socket){
   {
     check_inlist(coll, guid, socket);
     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()
diff --git a/static/js/chat.js b/static/js/chat.js
index 94c57385..e62cf2bd 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -29,8 +29,10 @@ $(".chat-tab").click(function(){
     $("#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)
   {
     //$("#chat-btn").css("color", "grey");
@@ -47,7 +49,7 @@ socket.on("chat.all", function(data)
     unseen = true;
   }
   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));
   $("#chatall li:last")[0].appendChild(in_text);
   document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight