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

More instant frontpage-loading, and sorting frontpages on the backend for consistency

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-08-10 11:51:28 +02:00
parent 8c29c31449
commit 6d0acaefcb
11 changed files with 147 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,6 +677,12 @@ var Channel = {
var response = document.createElement("div");
response.innerHTML = e;
var newList = response.querySelector("#lists-script").innerHTML;
newList = newList.trim().replace("window.lists = ", "");
newList = newList.substring(0, newList.length);
window.lists = JSON.parse(newList);
response.querySelector("#lists-script").remove();
Helper.removeElement("#sidenav-overlay");
document.getElementsByTagName("main")[0].className = "center-align container";
Helper.removeClass("#main-container", "channelpage");

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

@@ -20,16 +20,16 @@ var Frontpage = {
"Frontpage fetch",
msg
]);
Frontpage.all_channels = lists;
var msg = lists;
delete lists;
lists = undefined;
document.querySelector("#lists-script").remove();
Frontpage.all_channels = window.lists;
var msg = window.lists;
delete window.lists;
window.lists = undefined;
//document.querySelector("#lists-script").remove();
if(msg.length == 0) {
Helper.css("#preloader", "display", "none");
document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "<p>No channels yet</p>");
} else {
console.log(msg);
Frontpage.populate_channels(msg, true, false);
}
//Frontpage.set_viewers(msg.viewers);
@@ -79,7 +79,6 @@ var Frontpage = {
]);
for(var x in lists) {
//console.log(lists[x]._id);
var chan = Helper.decodeChannelName(lists[x]._id);
if(num<12 || !popular) {
var id = lists[x].id;
@@ -160,7 +159,7 @@ var Frontpage = {
document.getElementById("channels").style.display = "block";
//Materialize.fadeInImage('#channels');
//$("#channels").fadeIn(800);
document.getElementById("autocomplete-input").focus();
//document.getElementById("autocomplete-input").focus();
num = 0;
},
@@ -264,7 +263,7 @@ var Frontpage = {
if(Frontpage.times_rotated == 50 && frontpage){
Frontpage.times_rotated = 0;
i = 0;
Frontpage.get_frontpage_lists();
//Frontpage.get_frontpage_lists();
}else if(frontpage){
Frontpage.times_rotated += 1;
Frontpage.add_backdrop(list, i+1);
@@ -440,12 +439,11 @@ var Frontpage = {
}
channel_list = document.querySelector(".hidden-channel-list").cloneNode(true).innerHTML;
console.log(channel_list);
try {
document.querySelector(".hidden-channel-list").remove();
}catch(e){}
if(window.location.hostname != "fb.zoff.me") Frontpage.share_link_modifier();
Frontpage.share_link_modifier();
if(window.location.hostname == "zoff.me" || window.location.hostname == "fb.zoff.me") add = "https://zoff.me";
else add = window.location.hostname;
@@ -464,10 +462,11 @@ var Frontpage = {
setup_playlist_listener();
}
M.Modal.init(document.getElementById("about"));
/*M.Modal.init(document.getElementById("about"));
M.Modal.init(document.getElementById("help"));
M.Modal.init(document.getElementById("contact"));
M.Modal.init(document.getElementById("contact"));*/
var elem = document.querySelector('select');
document.querySelector(".no-jump-select").remove();
M.FormSelect.init(elem);
Helper.log([
@@ -516,7 +515,7 @@ var Frontpage = {
if(!localStorage.ok_cookie){
before_toast();
M.toast({html: "We're using cookies to enhance your experience! <a class='waves-effect waves-light btn light-green' href='#' id='cookieok' style='cursor:pointer;pointer-events:all;margin-left:10px;'> ok</a>", displayLength: 10000});
//M.toast({html: "We're using cookies to enhance your experience! <a class='waves-effect waves-light btn light-green' href='#' id='cookieok' style='cursor:pointer;pointer-events:all;margin-left:10px;'> ok</a>", displayLength: 10000});
}
//var pad = 0;

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

@@ -941,11 +941,11 @@ addListener("click", ".first_page", function(event){
addListener("click", ".donate-button", function(event) {
this.preventDefault();
M.Modal.init(document.getElementById("donate"));
ga('send', 'event', "button-click", "donate");
M.Modal.getInstance(document.getElementById("donate")).open();
});
addListener("click", '#toast-container', function(){
before_toast();
});
@@ -1223,14 +1223,32 @@ addListener("click", "#twitter-code-link", function() {
});
addListener("click", ".help-button-footer", function() {
this.preventDefault();
M.Modal.init(document.getElementById("help"));
ga('send', 'event', "button-click", "help-footer");
M.Modal.getInstance(document.getElementById("help")).open();
});
addListener("click", "#embed-button", function() {
this.preventDefault();
M.Modal.init(document.getElementById("embed"));
ga('send', 'event', "button-click", "embed-channel", "channel-name", chan.toLowerCase());
})
M.Modal.getInstance(document.getElementById("embed")).open();
});
addListener("click", "#contact-button", function() {
this.preventDefault();
M.Modal.init(document.getElementById("contact"));
ga('send', 'event', "button-click", "contact-footer");
M.Modal.getInstance(document.getElementById("contact")).open();
});
addListener("click", ".about-button", function() {
this.preventDefault();
M.Modal.init(document.getElementById("about"));
ga('send', 'event', "button-click", "contact-footer");
M.Modal.getInstance(document.getElementById("about")).open();
});
addListener("click", ".playlist-link", function(event){
chat_active = false;