Added 'hidden' fireplace player

This commit is contained in:
Kasper Rynning-Tønnesen
2017-02-24 12:29:43 +01:00
parent 7ea5f6e81c
commit cbc2a26eac
6 changed files with 59 additions and 8 deletions

View File

@@ -1445,6 +1445,14 @@ ul #chat-log{
position: relative; position: relative;
} }
#fireplace_player{
z-index: 1;
width: calc(100% - .75rem);
height: calc(100% - 32px);
position: absolute;
display:none;
}
.chan{ .chan{
padding-right:10px; padding-right:10px;
max-width:22vw; max-width:22vw;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -18,6 +18,7 @@ var paused = false;
var playing = false; var playing = false;
var SAMPLE_RATE = 6000; // 6 seconds var SAMPLE_RATE = 6000; // 6 seconds
var lastSample = Date.now(); var lastSample = Date.now();
var fireplace_initiated = false;
var began = false; var began = false;
var i = -1; var i = -1;
var lazy_load = false; var lazy_load = false;
@@ -50,6 +51,7 @@ var chromecastReady = false;
var found_array = []; var found_array = [];
var found_array_index = 0; var found_array_index = 0;
var castSession; var castSession;
var width_timeout;
if(localStorage.debug === undefined){ if(localStorage.debug === undefined){
var debug = false; var debug = false;
@@ -467,7 +469,8 @@ function init(){
} }
if(!Helper.mobilecheck() && navigator.userAgent.match(/iPad/i) == null){ if(!Helper.mobilecheck() && navigator.userAgent.match(/iPad/i) == null){
set_title_width(); setTimeout(function(){set_title_width();}, 100);
} }
} }
@@ -836,7 +839,17 @@ $(document).keyup(function(e) {
if($(".search-container").length != 0 && !Helper.contains($(".search-container").attr("class").split(" "), "hide")){ if($(".search-container").length != 0 && !Helper.contains($(".search-container").attr("class").split(" "), "hide")){
$("#results").toggleClass("hide"); $("#results").toggleClass("hide");
} }
} } else if(event.keyCode == 13 && $("#search").val() == "fireplace" && !$(".search-container").hasClass("hide") && window.location.pathname != "/") {
if(fireplace_initiated) {
fireplace_initiated = false;
$("#fireplace_player").css("display", "none");
Player.fireplace.destroy();
} else {
fireplace_initiated = true;
$("#fireplace_player").css("display", "block");
Player.createFireplacePlayer();
}
}
}); });
$(document).on("mouseenter", ".card.sticky-action", function(e){ $(document).on("mouseenter", ".card.sticky-action", function(e){
@@ -1570,6 +1583,7 @@ function onepage_load(){
w_p = true; w_p = true;
socket.emit("list", chan.toLowerCase()); socket.emit("list", chan.toLowerCase());
}else if(url_split[3] === ""){ }else if(url_split[3] === ""){
clearTimeout(width_timeout);
$("#channel-load").css("display", "block"); $("#channel-load").css("display", "block");
window.scrollTo(0, 0); window.scrollTo(0, 0);

View File

@@ -5,6 +5,7 @@ var Player = {
after_load: "", after_load: "",
player: "", player: "",
stopInterval: false, stopInterval: false,
fireplace: "",
youtube_listener: function(obj) youtube_listener: function(obj)
{ {
@@ -444,6 +445,33 @@ var Player = {
//Youtube.durationSetter(); //Youtube.durationSetter();
}, },
createFireplacePlayer: function() {
Player.fireplace = new YT.Player('fireplace_player', {
videoId: "L_LUpnjgPso",
playerVars: { rel:"0", wmode:"transparent", controls: "0" , fs: "0", iv_load_policy: "3", theme:"light", color:"white", showinfo: 0},
events: {
'onReady': Player.onFireplaceReady,
'onStateChange': Player.onFireplaceChange
}
});
},
onFireplaceReady: function() {
Player.fireplace.playVideo();
},
onFireplaceChange: function(newState) {
switch(newState.data) {
case 0:
Player.fireplace.seekTo(0);
Player.fireplace.playVideo();
break;
case 2:
Player.fireplace.playVideo();
break;
}
},
durationSetter: function() durationSetter: function()
{ {
/*try{ /*try{

View File

@@ -141,6 +141,7 @@
width: calc(100% - 261px); width: calc(100% - 261px);
display: inline; display: inline;
--> -->
<div id="fireplace_player" class="ytplayer"></div>
<div id="player" class="ytplayer"></div> <div id="player" class="ytplayer"></div>
<div id="main_components"> <div id="main_components">
<div id="player_overlay" class="hide valign-wrapper"> <div id="player_overlay" class="hide valign-wrapper">