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

Removed unused variables and trying to fix frontpage error on fb.zoff.me

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-10-16 22:03:33 +02:00
parent b25ca4eadd
commit 296327ba7d
7 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/handlers/frontpage.js
View File

@@ -1,5 +1,5 @@
function frontpage_lists(msg, socket) { function frontpage_lists(msg, socket) {
if(!msg.hasOwnProperty('version') || msg.version != VERSION || msg.version == undefined) { if(msg == undefined || !msg.hasOwnProperty('version') || msg.version != VERSION || msg.version == undefined) {
socket.emit("update_required"); socket.emit("update_required");
} }

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

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

@@ -116,7 +116,7 @@ var Chat = {
} }
} }
var icon_add = ""; var icon_add = "";
if(inp.hasOwnProperty("icon") && inp.icon != false && inp.icon != "") { if(inp.hasOwnProperty("icon") && !inp.icon && inp.icon != "") {
icon_add = "<img class='chat-icon' src='" + inp.icon + "' alt='" + inp.from + "'>"; icon_add = "<img class='chat-icon' src='" + inp.icon + "' alt='" + inp.from + "'>";
} }
@@ -152,7 +152,7 @@ var Chat = {
} }
var icon_add = ""; var icon_add = "";
if(data.hasOwnProperty("icon") && data.icon != false && data.icon != "") { if(data.hasOwnProperty("icon") && !data.icon && data.icon != "") {
icon_add = "<img class='chat-icon' src='" + data.icon + "' alt='" + data.from + "'>"; icon_add = "<img class='chat-icon' src='" + data.icon + "' alt='" + data.from + "'>";
} }

4
server/public/assets/js/frontpage.js
View File

@@ -221,8 +221,6 @@ var Frontpage = {
Frontpage.times_rotated = 0; Frontpage.times_rotated = 0;
i = 0; i = 0;
Frontpage.get_frontpage_lists(); Frontpage.get_frontpage_lists();
//socket.emit("frontpage_lists", {version: parseInt(localStorage.getItem("VERSION"))});
socket.emit('get_userlists', Crypt.getCookie('_uI'));
}else if(frontpage){ }else if(frontpage){
Frontpage.times_rotated += 1; Frontpage.times_rotated += 1;
Frontpage.add_backdrop(list, i+1); Frontpage.add_backdrop(list, i+1);
@@ -432,8 +430,6 @@ function initfp() {
}); });
} }
Frontpage.get_frontpage_lists(); Frontpage.get_frontpage_lists();
//socket.emit('frontpage_lists', {version: parseInt(localStorage.getItem("VERSION"))});
//socket.emit('get_userlists', Crypt.getCookie('_uI'));
$("#channel-load").css("display", "none"); $("#channel-load").css("display", "none");
//Materialize.toast("<a href='/remote' style='color:white;'>Try out our new feature, remote!</a>", 8000) //Materialize.toast("<a href='/remote' style='color:white;'>Try out our new feature, remote!</a>", 8000)

2
server/public/assets/js/list.js
View File

@@ -424,7 +424,7 @@ var List = {
deleted_song: function(deleted, removed) { deleted_song: function(deleted, removed) {
try{ try{
var index = List.getIndexOfSong(deleted); var index = List.getIndexOfSong(deleted);
var to_delete = $("#wrapper").children()[index]; //var to_delete = $("#wrapper").children()[index];
//if(!removed) to_delete.style.height = 0; //if(!removed) to_delete.style.height = 0;
if(index < List.page && $("#wrapper").children().length - (List.page + 2) >= 0){ if(index < List.page && $("#wrapper").children().length - (List.page + 2) >= 0){

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

@@ -14,10 +14,8 @@ var music = 0;
var frontpage = 1; var frontpage = 1;
var adminpass = ""; var adminpass = "";
var showDiscovery = false; var showDiscovery = false;
var filesadded = "";
var temp_name = ""; var temp_name = "";
var temp_pass = ""; var temp_pass = "";
var chromecast_icon_color = "";
var player_ready = false; var player_ready = false;
var viewers = 1; var viewers = 1;
var temp_user_pass = ""; var temp_user_pass = "";
@@ -90,7 +88,6 @@ var firstScriptTag;
var title; var title;
var viewers; var viewers;
var video_id; var video_id;
var list;
var seekTo; var seekTo;
var song_title; var song_title;
var previous_video_id; var previous_video_id;