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 with lists not being sorted properly on the frontpage

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-13 15:46:04 +02:00
parent a8fa6a2901
commit a42b746abf
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

@@ -39,19 +39,19 @@ var Frontpage = {
if(!lists[i].hasOwnProperty("viewers")){ if(!lists[i].hasOwnProperty("viewers")){
lists[i].viewers = 0; lists[i].viewers = 0;
} }
if(!lists[i].hasOwnProperty("accessed")) {
lists[i].accessed = 0;
}
if(!lists[i].hasOwnProperty("pinned")){ if(!lists[i].hasOwnProperty("pinned")){
lists[i].pinned = 0; lists[i].pinned = 0;
} } else if(lists[i].pinned == 1) {
if(!lists[i].hasOwnProperty("count") || lists[i].count == 0) { pinned = lists[i];
delete lists[i]; delete lists[i];
} }
} }
if(popular) { if(popular) {
lists = lists.sort(Helper.predicate({ lists = lists.sort(Helper.predicate({
name: 'pinned',
reverse: true
}, {
name: 'viewers', name: 'viewers',
reverse: true reverse: true
}, { }, {
@@ -63,9 +63,6 @@ var Frontpage = {
})); }));
} else { } else {
lists = lists.sort(Helper.predicate({ lists = lists.sort(Helper.predicate({
name: 'pinned',
reverse: true
}, {
name: 'viewers', name: 'viewers',
reverse: true reverse: true
}, { }, {
@@ -74,9 +71,7 @@ var Frontpage = {
})); }));
} }
if(pinned !== undefined){
lists.unshift(pinned); lists.unshift(pinned);
}
if(!Helper.mobilecheck()) { if(!Helper.mobilecheck()) {
clearTimeout(rotation_timeout); clearTimeout(rotation_timeout);
@@ -409,7 +404,7 @@ function initfp(){
if(window.location.hostname != "fb.zoff.me") share_link_modifier_frontpage(); if(window.location.hostname != "fb.zoff.me") share_link_modifier_frontpage();
if(window.location.hostname == "zoff.me") add = "https://zoff.me"; if(window.location.hostname != "zoff.me") add = "https://zoff.me";
else add = window.location.hostname; else add = window.location.hostname;
if(socket === undefined || Helper.mobilecheck() || user_auth_avoid) { if(socket === undefined || Helper.mobilecheck() || user_auth_avoid) {
socket = io.connect(''+add+':8080', connection_options); socket = io.connect(''+add+':8080', connection_options);