KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-24 08:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error where mobile couldn't skip videos if no video was playing

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-01-19 18:27:24 +01:00
parent b920b6d100
commit a5703d33d3
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/dist/embed.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
public/dist/main.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/listeners.js
-4
View File
@@ -1061,8 +1061,6 @@ $(document).on("click", "#bottom-button", function(){
$(document).keydown(function(event) { $(document).keydown(function(event) {
//console.log(find_start);
//console.log(event.keyCode);
if(window.location.pathname != "/"){ if(window.location.pathname != "/"){
if(event.keyCode == 91 || event.keyCode == 17){ if(event.keyCode == 91 || event.keyCode == 17){
find_start = true; find_start = true;
@@ -1071,11 +1069,9 @@ $(document).keydown(function(event) {
find_started = !find_started; find_started = !find_started;
event.preventDefault(); event.preventDefault();
if(find_started){ if(find_started){
console.log("time to search");
$("#find_div").toggleClass("hide"); $("#find_div").toggleClass("hide");
$("#find_input").focus(); $("#find_input").focus();
} else { } else {
console.log("abort search");
$("#find_div").toggleClass("hide"); $("#find_div").toggleClass("hide");
$("#find_input").val(""); $("#find_input").val("");
$("#find_input").blur(); $("#find_input").blur();
public/js/mobileremote.js
-5
View File
@@ -44,14 +44,9 @@ var Mobile_remote = {
value: 100, value: 100,
range: "min", range: "min",
animate: true, animate: true,
/*slide: function(event, ui) {
console.log(ui.value);
//localStorage.setItem("volume", ui.value);
},*/
stop:function(event, ui) { stop:function(event, ui) {
socket.emit("id", {id: Mobile_remote.id, type: "volume", value: ui.value}); socket.emit("id", {id: Mobile_remote.id, type: "volume", value: ui.value});
Helper.log("volume"); Helper.log("volume");
//console.log(ui.value);
} }
}); });
} }
public/js/player.js
+7 -1
View File
@@ -35,8 +35,13 @@ var Player = {
Player.getTitle(obj.np[0].title, viewers); Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id); //Player.setBGimage(video_id);
if(!Helper.mobilecheck()) Player.notifyUser(obj.np[0].id, obj.np[0].title); if(!Helper.mobilecheck()) Player.notifyUser(obj.np[0].id, obj.np[0].title);
console.log("trying to stop");
if(!chromecastAvailable) Player.stopVideo(); if(!chromecastAvailable) Player.stopVideo();
video_id = obj.np[0].id;
conf = obj.conf[0];
time = obj.time;
seekTo = time - conf.startTime;
song_title = obj.np[0].title;
duration = obj.np[0].duration;
}else if(!paused){ }else if(!paused){
//Helper.log("gotten new song"); //Helper.log("gotten new song");
if(previous_video_id === undefined) if(previous_video_id === undefined)
@@ -194,6 +199,7 @@ var Player = {
}, },
loadVideoById: function(id){ loadVideoById: function(id){
console.log(id);
if(chromecastAvailable){ if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "loadVideo", videoId: id}); castSession.sendMessage("urn:x-cast:zoff.no", {type: "loadVideo", videoId: id});
} else { } else {
public/js/playercontrols.js
+1 -2
View File
@@ -62,8 +62,7 @@ var Playercontrols = {
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
} }
} else if(Player.player.getPlayerState() == 2 || Player.player.getPlayerState() === 0) } else if(Player.player.getPlayerState() == 2 || Player.player.getPlayerState() === 0 || (Player.player.getPlayerState() === 5 && Helper.mobilecheck())){
{
Player.playVideo(); Player.playVideo();
if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "block"; document.getElementById("player").style.display = "block";