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

Fixed some disconnect errors, and styling of opacity element

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-09 12:26:09 +02:00
parent 205de81585
commit 9b10bcaa20
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/server.js
View File

@@ -428,14 +428,15 @@ io.on('connection', function(socket){
{ {
if(in_list) if(in_list)
{ {
try if(contains(lists[coll], guid))
{ {
io.sockets.emit('chat,'+coll, rndName(guid) + " left");
console.log(guid + " left list " + coll); console.log(guid + " left list " + coll);
var index = lists[coll].indexOf(guid); var index = lists[coll].indexOf(guid);
lists[coll].splice(index, 1); lists[coll].splice(index, 1);
io.sockets.emit(coll+",viewers", lists[coll].length); io.sockets.emit(coll+",viewers", lists[coll].length);
}catch(err){} io.sockets.emit('chat,'+coll, rndName(guid) + " left");
}
} }
}); });

2
static/css/style.css
View File

@@ -208,7 +208,7 @@ hide mdi-action-visibility mdi-action-visibility-off
float: left; float: left;
} }
#chat-btn { #chat-btn i {
-webkit-transition:opacity 1s; -webkit-transition:opacity 1s;
transition:opacity 1s; transition:opacity 1s;
} }

6
static/js/chat.js
View File

@@ -14,7 +14,7 @@ document.getElementById("chat-btn").addEventListener("click", function(){
console.log("clicked"); console.log("clicked");
$("#text-chat-input").focus(); $("#text-chat-input").focus();
//$("#chat-btn").css("color", "white"); //$("#chat-btn").css("color", "white");
$("#chat-btn").css("opacity", 1); $("#chat-btn i").css("opacity", 1);
clearInterval(blink_interval); clearInterval(blink_interval);
blink_interval_exists = false; blink_interval_exists = false;
}); });
@@ -39,8 +39,8 @@ socket.on("chat,"+chan.toLowerCase(), function(data)
function chat_blink() function chat_blink()
{ {
$("#chat-btn").css("opacity", 0.5); $("#chat-btn i").css("opacity", 0.5);
setTimeout(function(){$("#chat-btn").css("opacity", 1);}, 1000); setTimeout(function(){$("#chat-btn i").css("opacity", 1);}, 1000);
} }
function hashCode(str) { // java String#hashCode function hashCode(str) { // java String#hashCode