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

Error log and now showing video on play in small player on desktop

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-06-21 18:49:52 +02:00
parent 58d26e4197
commit 48099e93d8
5 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/apps/client.js
View File

@@ -74,6 +74,7 @@ app.get('/robots.txt', function (req, res) {
app.use(function (req, res, next) { app.use(function (req, res, next) {
var cookie = req.cookies._uI; var cookie = req.cookies._uI;
if (cookie === undefined) { if (cookie === undefined) {
console.error((new Date), "couldn't fetch cookie for some reason, maybe no cookie exists?", req, "couldn't fetch cookie for some reason, maybe no cookie exists?");
var user_name = Functions.hash_pass(Functions.rndName(uniqid.time(), 15)); var user_name = Functions.hash_pass(Functions.rndName(uniqid.time(), 15));
res.cookie('_uI', user_name, { res.cookie('_uI', user_name, {
maxAge: 365 * 10000 * 3600000, maxAge: 365 * 10000 * 3600000,
@@ -82,6 +83,7 @@ app.use(function (req, res, next) {
sameSite: true, sameSite: true,
}); });
} else { } else {
//process.stderr.write((new Date), "couldn't fetch cookie for some reason, maybe no cookie exists?", req, "couldn't fetch cookie for some reason, maybe no cookie exists?");
res.cookie('_uI', cookie, { res.cookie('_uI', cookie, {
maxAge: 365 * 10000 * 3600000, maxAge: 365 * 10000 * 3600000,
httpOnly: true, httpOnly: true,

2
server/handlers/list_change.js
View File

@@ -732,7 +732,7 @@ function delete_all(msg, coll, guid, offline, socket) {
if(conf.length == 1 && conf) { if(conf.length == 1 && conf) {
conf = conf[0]; conf = conf[0];
if(conf.adminpass == hash && conf.adminpass != "" && (conf.userpass == "" || conf.userpass == undefined || (conf.userpass != "" && conf.userpass != undefined && conf.pass == hash_userpass))) { if(conf.adminpass == hash && conf.adminpass != "" && (conf.userpass == "" || conf.userpass == undefined || (conf.userpass != "" && conf.userpass != undefined && conf.pass == hash_userpass))) {
db.collection(coll).remove({views: {$exists: false}}, {multi: true}, function(err, succ) { db.collection(coll).remove({views: {$exists: false}, type: "video"}, {multi: true}, function(err, succ) {
List.send_list(coll, false, true, true, true); List.send_list(coll, false, true, true, true);
db.collection("frontpage_lists").update({_id: coll}, {$set: {count: 0, accessed: Functions.get_time()}}, {upsert: true}, function(err, docs) {}); db.collection("frontpage_lists").update({_id: coll}, {$set: {count: 0, accessed: Functions.get_time()}}, {upsert: true}, function(err, docs) {});
socket.emit("toast", "deleted_songs"); socket.emit("toast", "deleted_songs");

8
server/public/assets/css/style.css
View File

@@ -3115,6 +3115,14 @@ nav ul li:hover, nav ul li.active {
width: 100vw; width: 100vw;
} }
.pointer-events-all-mobile {
pointer-events: all !important;
}
.small-display {
display: block !important;
}
.hide-on-small-only{ .hide-on-small-only{
display:none; display:none;
} }

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

@@ -20,6 +20,10 @@ var Channel = {
client_id: 'ed53fc01f248f15becddf8eb52cc91ef' client_id: 'ed53fc01f248f15becddf8eb52cc91ef'
}, function() { }, function() {
}); });
if(cast_ready_connect || chromecastAvailable || chromecastReady) {
Helper.addClass(".volume-container", "volume-container-cast");
}
//Player.soundcloud_player = document.querySelector("#soundcloud_player"); //Player.soundcloud_player = document.querySelector("#soundcloud_player");
} }
Admin.logged_in = false; Admin.logged_in = false;

14
server/public/assets/js/player.js
View File

@@ -147,10 +147,13 @@ var Player = {
//} //}
} }
if(Helper.mobilecheck()) { /*if(Helper.mobilecheck()) {
Helper.css("#player", "display", "block"); Helper.css("#player", "display", "block");
Helper.css("#player", "pointer-events", "all"); Helper.css("#player", "pointer-events", "all");
} }*/
Helper.addClass("#player", "pointer-events-all-mobile");
Helper.removeClass("#video-container", "click-through");
Helper.addClass("#player", "small-display");
Helper.css("#playpause", "visibility", "visible"); Helper.css("#playpause", "visibility", "visible");
Helper.css("#playpause", "pointer-events", "all"); Helper.css("#playpause", "pointer-events", "all");
playing = true; playing = true;
@@ -198,10 +201,13 @@ var Player = {
mobile_beginning = true; mobile_beginning = true;
} }
} }
if(Helper.mobilecheck()) { /*if(Helper.mobilecheck()) {
Helper.css("#player", "display", "none"); Helper.css("#player", "display", "none");
Helper.css("#player", "pointer-events", "none"); Helper.css("#player", "pointer-events", "none");
} }*/
Helper.removeClass("#player", "pointer-events-all-mobile");
Helper.addClass("#video-container", "click-through");
Helper.removeClass("#player", "small-display");
break; break;
case YT.PlayerState.BUFFERING: case YT.PlayerState.BUFFERING:
//was_stopped = false; //was_stopped = false;