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 skipping/pause issues

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-01 12:52:38 +01:00
parent 5145b8d03c
commit d7677a5f7a
2 changed files with 190 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*
var conf = [];
var private_channel = false;
var music = 0;
var gotten_np = false;
var frontpage = 1;
var empty_clear = false;
var adminpass = "";

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

@@ -22,6 +22,9 @@ var Player = {
} catch(e) {
state = null;
}
if(!paused) {
gotten_np = true;
}
if((((!offline && (state != null || from_frontpage)) || (offline && (!(state != null) || from_frontpage))|| (!offline && (!(state != null) || from_frontpage)) || (offline && state == -1)) && !(offline && prev_chan_player == chan)) || (offline && video_id == undefined)){
prev_chan_player = chan;
from_frontpage = false;
@@ -55,6 +58,7 @@ var Player = {
}catch(e){}
//List.importOldList(channel.toLowerCase());
} else if(paused){
Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id);
if(!Helper.mobilecheck()) {
@@ -215,9 +219,10 @@ var Player = {
$("#playpause").css("pointer-events", "all");
$("#channel-load").css("display", "none");
}
if(!empty_clear) {
if(!empty_clear && !gotten_np) {
paused = true;
}
if(gotten_np) gotten_np = false;
if(window.location.pathname != "/") Playercontrols.play_pause_show();
mobile_beginning = true;
}
@@ -252,6 +257,7 @@ var Player = {
}
//Playercontrols.play_pause();
} else {
paused = true;
Player.player.pauseVideo();
}
},