KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-05-12 16:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated embedded player, and fixes for chromecast on mobile

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-11-22 18:20:55 +01:00
parent db2887c610
commit 4592f4d7f9
7 changed files with 70 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/style.css
View File

@@ -1652,7 +1652,7 @@ nav ul li:hover, nav ul li.active {
font-size: 31px;
}
.castButton, .castButton-active{
.castButton, .castButton:active, .castButton:focus, .castButton:hover, .castButton-active, .castButton-active:active, .castButton-active:hover, .castButton-active:focus{
font-size: 28px;
margin: 0 33px 0 0px;
}
@@ -1719,7 +1719,7 @@ nav ul li:hover, nav ul li.active {
margin-top:-6px;
}
.click-through{
#player{
pointer-events:none;
}

4
static/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
static/js/embed.js
View File

@@ -10,6 +10,7 @@ var vol = 100;
var adminpass = "";
var mobile_beginning = false;
var durationBegun = false;
var chromecastAvailable = false;
var seekTo;
var socket;
@@ -36,7 +37,7 @@ $(document).ready(function(){
$("head").append('<link type="text/css" rel="stylesheet" href="/static/css/embed.css" />');
$("head").append('<link type="text/css" rel="stylesheet" href="/static/css/materialize.min.css" />');
add = "https://zoff.no";
add = "http://localhost";
socket = io.connect(''+add+':8880', connection_options);
socket.on("get_list", function(){

21
static/js/listeners.js
View File

@@ -244,6 +244,7 @@ function init(){
}
initializeCastApi = function() {
$(".castButton").css("display", "block");
cast.framework.CastContext.getInstance().setOptions({
receiverApplicationId: "E6856E24",
autoJoinPolicy: chrome.cast.AutoJoinPolicy.ORIGIN_SCOPED});
@@ -258,7 +259,13 @@ initializeCastApi = function() {
chromecastAvailable = true;
paused = false;
mobile_beginning = false;
castSession.sendMessage("urn:x-cast:zoff.no", {type: "loadVideo", videoId: video_id, seekTo: Player.player.getCurrentTime()})
var _seekTo;
try{
_seekTo = Player.player.getCurrentTime();
} catch(e){
_seekTo = seekTo;
}
castSession.sendMessage("urn:x-cast:zoff.no", {type: "loadVideo", videoId: video_id, seekTo: _seekTo})
castSession.sendMessage("urn:x-cast:zoff.no", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
hide_native(1);
break;
@@ -268,7 +275,13 @@ initializeCastApi = function() {
chromecastAvailable = true;
paused = false;
mobile_beginning = false;
castSession.sendMessage("urn:x-cast:zoff.no", {type: "loadVideo", videoId: video_id, seekTo: Player.player.getCurrentTime()})
var _seekTo;
try{
_seekTo = Player.player.getCurrentTime();
} catch(e){
_seekTo = seekTo;
}
castSession.sendMessage("urn:x-cast:zoff.no", {type: "loadVideo", videoId: video_id, seekTo: _seekTo})
castSession.sendMessage("urn:x-cast:zoff.no", {type: "nextVideo", videoId: full_playlist[0].id, title: full_playlist[0].title})
hide_native(1);
break;
@@ -290,7 +303,9 @@ function hide_native(way){
$("#fullscreen").toggleClass("hide");
$("#volume-button").toggleClass("hide");
$("#volume").toggleClass("hide");
Player.player.stopVideo();
try{
Player.player.stopVideo();
} catch(e){}
Player.stopInterval = true;
//$("#player").toggleClass("hide");
$("#player_overlay").removeClass("hide");

5
static/js/player.js
View File

@@ -35,6 +35,7 @@ var Player = {
Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id);
if(!Helper.mobilecheck()) Player.notifyUser(obj.np[0].id, obj.np[0].title);
console.log("trying to stop");
Player.stopVideo();
}else if(!paused){
//Helper.log("gotten new song");
@@ -261,9 +262,9 @@ var Player = {
Player.durationSetter();
if(embed){
setTimeout(function(){
Player.seekTo(seekTo);
Player.player.seekTo(seekTo);
if(!autoplay){
Player.pauseVideo();
Player.player.pauseVideo();
Playercontrols.play_pause_show();
}
}, 1000);