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

Trying to use rest to fetch frontpagelists

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-17 21:39:30 +02:00
parent 1f342c4090
commit de92bae7f5
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@@ -260,14 +260,30 @@ var Frontpage = {
if(Frontpage.times_rotated == 50 && frontpage){ if(Frontpage.times_rotated == 50 && frontpage){
Frontpage.times_rotated = 0; Frontpage.times_rotated = 0;
i = 0; i = 0;
socket.emit("frontpage_lists", {version: parseInt(localStorage.getItem("VERSION"))}); Frontpage.get_frontpage_lists();
//socket.emit("frontpage_lists", {version: parseInt(localStorage.getItem("VERSION"))});
socket.emit('get_userlists', Crypt.getCookie('_uI')); 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);
} }
},6000); },6000);
},
get_frontpage_lists: function(){
$.ajax({
url: "/api/frontpages",
method: "get",
success: function(response){
Frontpage.populate_channels(response, true);
},
error: function() {
Materialize.toast("Couldn't fetch lists, trying again in 3 seconds..", 3000, "red lighten connect_error");
retry_frontpage = setTimeout(function(){
Frontpage.get_frontpage_lists();
}, 3000);
},
});
}, },
start_snowfall: function(){ start_snowfall: function(){
@@ -316,6 +332,7 @@ var Frontpage = {
$("#frontpage-viewer-counter").tooltip("remove"); $("#frontpage-viewer-counter").tooltip("remove");
$("#offline-mode").tooltip("remove"); $("#offline-mode").tooltip("remove");
currently_showing_channels = 1; currently_showing_channels = 1;
clearTimeout(retry_frontpage);
$.ajax({ $.ajax({
url: "/" + new_channel, url: "/" + new_channel,
method: "get", method: "get",
@@ -449,7 +466,8 @@ function initfp(){
position: "bottom", position: "bottom",
tooltip: "Total Viewers" tooltip: "Total Viewers"
}); });
socket.emit('frontpage_lists', {version: parseInt(localStorage.getItem("VERSION"))}); Frontpage.get_frontpage_lists();
//socket.emit('frontpage_lists', {version: parseInt(localStorage.getItem("VERSION"))});
//socket.emit('get_userlists', Crypt.getCookie('_uI')); //socket.emit('get_userlists', Crypt.getCookie('_uI'));
$("#channel-load").css("display", "none"); $("#channel-load").css("display", "none");

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

@@ -19,6 +19,7 @@ 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 = "";
var retry_frontpage;
var chromecast_specs_sent = false; var chromecast_specs_sent = false;
var dragging = false; var dragging = false;
var user_auth_started = false; var user_auth_started = false;