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 issue where chat-blinking pointed to a dead local link

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-06-15 13:51:13 +02:00
parent 7e0b1d9034
commit 2a87d4f10e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/css/style.css
View File

@@ -2788,7 +2788,7 @@ nav ul li:hover, nav ul li.active {
pointer-events: none; pointer-events: none;
background: none; background: none;
font-family: Androgyne; font-family: Androgyne;
background-image: url('public/images/s1.png'), url('public/images/s2.png'), url('public/images/s3.png'); background-image: url('assets/images/s1.png'), url('assets/images/s2.png'), url('assets/images/s3.png');
height: 100%; height: 100%;
left: 0; left: 0;
position: absolute; position: absolute;

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
server/public/assets/js/chat.js
View File

@@ -81,7 +81,7 @@ var Chat = {
if(inp.msg.substring(0,1) == ":" && !chat_active) if(inp.msg.substring(0,1) == ":" && !chat_active)
{ {
Chat.all_received += 1; Chat.all_received += 1;
$("#favicon").attr("href", "public/images/highlogo.png"); $("#favicon").attr("href", "assets/images/highlogo.png");
unseen = true; unseen = true;
chat_unseen = true; chat_unseen = true;
if($(".chat-link span.badge.new.white").hasClass("hide")){ if($(".chat-link span.badge.new.white").hasClass("hide")){
@@ -95,7 +95,7 @@ var Chat = {
if(document.hidden) if(document.hidden)
{ {
$("#favicon").attr("href", "public/images/highlogo.png"); $("#favicon").attr("href", "assets/images/highlogo.png");
} }
if($("#chatall").children().length > 100){ if($("#chatall").children().length > 100){
@@ -119,7 +119,7 @@ var Chat = {
{ {
if(data.msg.substring(0,1) == ":" && !chat_active) if(data.msg.substring(0,1) == ":" && !chat_active)
{ {
$("#favicon").attr("href", "public/images/highlogo.png"); $("#favicon").attr("href", "assets/images/highlogo.png");
unseen = true; unseen = true;
chat_unseen = true; chat_unseen = true;
Chat.channel_received += 1; Chat.channel_received += 1;

8
server/public/assets/js/listeners.js
View File

@@ -1350,7 +1350,7 @@ $(document).on("submit", "#listImportSpotify", function(e){
}); });
$(window).focus(function(){ $(window).focus(function(){
$("#favicon").attr("href", "public/images/favicon.png"); $("#favicon").attr("href", "assets/images/favicon.png");
unseen = false; unseen = false;
}); });
@@ -1389,7 +1389,7 @@ $(document).on("click", ".chat-link", function(){
$(".chat-link span.badge.new.white").addClass("hide"); $(".chat-link span.badge.new.white").addClass("hide");
} }
unseen = false; unseen = false;
$("#favicon").attr("href", "public/images/favicon.png"); $("#favicon").attr("href", "assets/images/favicon.png");
}); });
function searchTimeout(event) { function searchTimeout(event) {
@@ -1441,7 +1441,7 @@ $(document).on("click", ".chat-link", function(e){
chat_unseen = false; chat_unseen = false;
$(".chat-link").attr("style", "color: white !important;"); $(".chat-link").attr("style", "color: white !important;");
blinking = false; blinking = false;
$("#favicon").attr("href", "public/images/favicon.png"); $("#favicon").attr("href", "assets/images/favicon.png");
$("#chatPlaylist").css("display", "block"); $("#chatPlaylist").css("display", "block");
$("#wrapper").css("display", "none"); $("#wrapper").css("display", "none");
$("#suggestions").css("display", "none"); $("#suggestions").css("display", "none");
@@ -1840,7 +1840,7 @@ function onepage_load(){
else $("main").append($(response.find("#main_section_frontpage")).wrap("<div>").parent().html()); else $("main").append($(response.find("#main_section_frontpage")).wrap("<div>").parent().html());
$(".page-footer").removeClass("padding-bottom-extra"); $(".page-footer").removeClass("padding-bottom-extra");
$(".page-footer").removeClass("padding-bottom-novideo"); $(".page-footer").removeClass("padding-bottom-novideo");
$("#favicon").attr("href", "public/images/favicon.png"); $("#favicon").attr("href", "assets/images/favicon.png");
$(".context-menu-list").remove(); $(".context-menu-list").remove();
Helper.log(socket); Helper.log(socket);