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

Merge branch 'master' of github.com:nixolas1/Zoff

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-05-18 16:31:41 +02:00
parent ec2c9cda08 c02ce87642
commit a33985eba8
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/chat.js
View File

@@ -31,7 +31,6 @@ $(".chat-tab").click(function(){
socket.on("chat.all", function(inp)
{
data = inp[0];
if($("#chat-bar").position()["left"] != 0)
{
@@ -48,9 +47,9 @@ socket.on("chat.all", function(inp)
$("#favicon").attr("href", "static/images/highlogo.png");
unseen = true;
}
var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6);
$("#chatall").append("<li title='"+inp[1]+"'><span style='color:"+color+";'>"+data.substring(0,data.indexOf(": "))+"</span></li>");
var in_text = document.createTextNode(data.substring(data.indexOf(": ")));
var color = intToARGB(hashCode(inp[0])).substring(0,6);
$("#chatall").append("<li title='"+inp[2]+"'><span style='color:"+color+";'>"+inp[0]+"</span></li>");
var in_text = document.createTextNode(inp[1]);
$("#chatall li:last")[0].appendChild(in_text);
document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight
});
@@ -77,9 +76,9 @@ socket.on("chat,"+chan.toLowerCase(), function(data)
}
}
}
var color = intToARGB(hashCode(data.substring(0,data.indexOf(": ")))).substring(0,6);
$("#chatchannel").append("<li><span style='color:"+color+";'>"+data.substring(0,data.indexOf(": "))+"</span></li>");
var in_text = document.createTextNode(data.substring(data.indexOf(": ")));
var color = intToARGB(hashCode(data[0])).substring(0,6);
$("#chatchannel").append("<li><span style='color:"+color+";'>"+data[0]+"</span></li>");
var in_text = document.createTextNode(data[1]);
$("#chatchannel li:last")[0].appendChild(in_text);
document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight
});

9
static/js/youtube.js
View File

@@ -73,7 +73,7 @@ socket.on(chan.toLowerCase()+",viewers", function(view)
$(document).ready(function()
{
Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000);
//Materialize.toast("Passwords have been reset. If anything is not right, please send us a mail @ contact@zoff.no", 10000);
$("#settings").sideNav({
menuWidth: 300, // Default is 240
edge: 'right', // Choose the horizontal origin
@@ -104,8 +104,11 @@ $(document).ready(function()
if(localStorage[chan.toLowerCase()])
{
localStorage.removeItem(chan.toLowerCase());
//socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase(), guid]);
//localStorage.removeItem(chan.toLowerCase());
if(localStorage[chan.toLowerCase()].length != 64)
localStorage.removeItem(chan.toLowerCase());
else
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase(), guid]);
}
if($("#chan").html().toLowerCase() == "jazz")