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 frontpage-sorting issue

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-08-10 11:59:49 +02:00
parent c20da5db3b
commit 0337a17168
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/handlers/frontpage.js
View File

@@ -27,7 +27,7 @@ function get_frontpage_lists(callback) {
"id": 1, "id": 1,
"title": 1, "title": 1,
"viewers": 1, "viewers": 1,
"pinned": 1, "pinned": { $ifNull: [ "$pinned", 0 ] },
"description": { "description": {
$ifNull: [ {$cond: { $ifNull: [ {$cond: {
"if": { "if": {

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

@@ -681,7 +681,12 @@ var Channel = {
var newList = response.querySelector("#lists-script").innerHTML; var newList = response.querySelector("#lists-script").innerHTML;
newList = newList.trim().replace("window.lists = ", ""); newList = newList.trim().replace("window.lists = ", "");
newList = newList.substring(0, newList.length); newList = newList.substring(0, newList.length);
window.lists = JSON.parse(newList); try {
window.lists = JSON.parse(newList);
} catch(e) {
console.error(e);
console.log(newList);
}
response.querySelector("#lists-script").remove(); response.querySelector("#lists-script").remove();
Helper.removeElement("#sidenav-overlay"); Helper.removeElement("#sidenav-overlay");
document.getElementsByTagName("main")[0].className = "center-align container"; document.getElementsByTagName("main")[0].className = "center-align container";

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

@@ -27,7 +27,7 @@ var Frontpage = {
window.lists = undefined; window.lists = undefined;
//document.querySelector("#lists-script").remove(); //document.querySelector("#lists-script").remove();
if(msg.length == 0) { if(msg.length == 0) {
Helper.css("#preloader", "display", "none"); //Helper.css("#preloader", "display", "none");
document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "<p>No channels yet</p>"); document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "<p>No channels yet</p>");
} else { } else {
Frontpage.populate_channels(msg, true, false); Frontpage.populate_channels(msg, true, false);