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 issues with favicon changing

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-04-19 21:50:10 +02:00
parent 5142ae0ce9
commit 6fadf0204f
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/css/style.css
View File

@@ -895,6 +895,13 @@ ul #chat-log{
/*background-color:rgba(0,0,0,0.2);*/ /*background-color:rgba(0,0,0,0.2);*/
} }
.chat-link{
-webkit-transition:color 1s;
-moz-transition:color 1s;
-o-transition:color 1s;
transition: color 1s;
}
#player{ #player{
height:95%; height:95%;
height: calc(100% - 32px); height: calc(100% - 32px);

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
static/js/chat.js
View File

@@ -50,7 +50,6 @@ var Chat = {
if(document.hidden) if(document.hidden)
{ {
$("#favicon").attr("href", "static/images/highlogo.png"); $("#favicon").attr("href", "static/images/highlogo.png");
unseen = true;
} }
var color = Helper.intToARGB(Helper.hashCode(inp[0])); var color = Helper.intToARGB(Helper.hashCode(inp[0]));
if(color.length < 6) { if(color.length < 6) {
@@ -74,8 +73,8 @@ var Chat = {
if(!blink_interval_exists && data.indexOf("changed name to") < 0 && !chat_active) if(!blink_interval_exists && data.indexOf("changed name to") < 0 && !chat_active)
{ {
$("#favicon").attr("href", "static/images/highlogo.png"); $("#favicon").attr("href", "static/images/highlogo.png");
blink_interval_exists = true; unseen = true;
blink_interval = setInterval(Chat.chat_blink, 2000); blink_interval = setTimeout(Chat.chat_blink, 1000);
} }
var color = Helper.intToARGB(Helper.hashCode(data[0])); var color = Helper.intToARGB(Helper.hashCode(data[0]));
@@ -95,8 +94,15 @@ var Chat = {
chat_blink: function() chat_blink: function()
{ {
$("#chat-btn i").css("opacity", 0.5); console.log("chat_blink");
setTimeout(function(){$("#chat-btn i").css("opacity", 1);}, 1000); $(".chat-link").css("color", "red");
setTimeout(function(){
$(".chat-link").css("color", "white");
if(unseen){
Chat.chat_blink();
}
}, 1000);
} }
} }

1
static/js/listeners.js
View File

@@ -323,6 +323,7 @@ $(document).on("submit", "#adminForm", function(e){
$(document).on("click", ".chat-link", function(e){ $(document).on("click", ".chat-link", function(e){
chat_active = true; chat_active = true;
unseen = false;
$("#favicon").attr("href", "static/images/favicon.png"); $("#favicon").attr("href", "static/images/favicon.png");
$("#chatPlaylist").css("display", "block"); $("#chatPlaylist").css("display", "block");
$("#wrapper").css("display", "none"); $("#wrapper").css("display", "none");