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

Added player at frontpage because of fun

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-05-09 14:37:27 +02:00
parent 0b3d5dd967
commit 2dd552b442
9 changed files with 86 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/list.js
View File

@@ -26,7 +26,7 @@ var List = {
List.voted_song(msg[1], msg[2]);
break;
case "song_change":
List.song_change(msg[1]);
if(window.location.pathname != "/") List.song_change(msg[1]);
break;
}
},

27
static/js/listeners.js
View File

@@ -74,6 +74,8 @@ $().ready(function(){
function init(){
var no_socket = true;
chan = $("#chan").html();
mobile_beginning = window.mobilecheck();
var side = window.mobilecheck() ? "left" : "right";
@@ -132,8 +134,11 @@ function init(){
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]);
}*/
if(socket == undefined){
no_socket = false;
socket = io.connect(''+add+':8880', connection_options);
}
socket = io.connect(''+add+':8880', connection_options);
Player.setup_youtube_listener(chan);
Admin.admin_listener();
@@ -164,6 +169,8 @@ function init(){
Player.getTitle(song_title, viewers);
});
if(no_socket) socket.emit('list', chan.toLowerCase());
if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("search").blur();
@@ -530,30 +537,36 @@ function onepage_load(){
Player.stopInterval = true;
Admin.display_logged_out();
Admin.beginning = true;
chan = "";
began = false;
durationBegun = false;
$("#embed-button").css("display", "none");
socket.removeAllListeners();
//socket.removeAllListeners();
//$("#player").appendTo("#frontpage_player");
$.ajax({
url: "php/nochan.php",
success: function(e){
socket.disconnect();
//socket.disconnect();
socket.removeEventListener("chat.all");
socket.removeEventListener("chat");
document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video);
document.getElementById("playpause").removeEventListener("click", Playercontrols.play_pause);
document.getElementById("fullscreen").removeEventListener("click", Playercontrols.fullscreen);
video_id = "";
song_title = "";
//video_id = "";
//song_title = "";
$("meta[name=theme-color]").attr("content", "#2D2D2D");
if(!/iPad|iPhone|iPod/.test(navigator.userAgent)) Player.ytplayer.destroy();
if(!window.mobilecheck()){
$("<a id='closePlayer'>X</a>").appendTo("#frontpage_player");
$("#player").appendTo("#frontpage_player");
Player.onYouTubeIframeAPIReady();
}
$(".drag-target").remove();
$("#sidenav-overlay").remove();

23
static/js/nochan.js
View File

@@ -224,16 +224,19 @@ var Nochan = {
$("#channel-load").css("display", "block");
window.scrollTo(0, 0);
frontpage = false;
socket.removeAllListeners();
//socket.removeAllListeners();
$("body").css("background-color", "#2d2d2d");
$.ajax({
url: chan + "/php/index.php",
success: function(e){
$("body").css("background-color", "#2d2d2d");
socket.disconnect();
if(Player.ytplayer != ""){
Player.ytplayer.destroy();
socket.emit("change_channel");
}
$("#frontpage_player").empty();
//socket.disconnect();
if(!popstate){
window.history.pushState("to the channel!", "Title", "/" + chan);
@@ -259,7 +262,6 @@ var Nochan = {
}
});
}
}
String.prototype.capitalizeFirstLetter = function() {
@@ -386,6 +388,15 @@ $(document).on('click', '#cookieok', function() {
});
});
$(document).on("click", "#closePlayer", function(e){
e.preventDefault();
socket.emit("change_channel");
Player.ytplayer.destroy();
Player.ytplayer = "";
document.title = "Zöff";
$("#frontpage_player").empty();
});
$(document).on('click', '#toast-container', function(){
$(this).fadeOut(function(){
$(this).remove();

27
static/js/player.js
View File

@@ -11,7 +11,6 @@ var Player = {
socket.on("np", function(obj)
{
Player.loaded = false;
if(obj.length == 0){
document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";
@@ -46,8 +45,10 @@ var Player = {
}
Suggestions.fetchYoutubeSuggests(video_id);
}catch(e){}
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
if(window.location.pathname != "/"){
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
}
//if(player_ready && !window.mobilecheck())
if(player_ready && !window.MSStream)
{
@@ -94,7 +95,7 @@ var Player = {
playing = false;
paused = false;
socket.emit("end", video_id);
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
break;
case 1:
playing = true;
@@ -103,14 +104,16 @@ var Player = {
beginning = false;
mobile_beginning = false;
}
if(!embed) Helper.addClass("#player_overlay", "hide");
if(document.getElementById("play").className.split(" ").length == 1)
$("#play").toggleClass("hide");
if(document.getElementById("pause").className.split(" ").length == 2)
$("#pause").toggleClass("hide");
if(!embed && window.location.pathname != "/") Helper.addClass("#player_overlay", "hide");
if(window.location.pathname != "/"){
if(document.getElementById("play").className.split(" ").length == 1)
$("#play").toggleClass("hide");
if(document.getElementById("pause").className.split(" ").length == 2)
$("#pause").toggleClass("hide");
}
if(paused)
{
socket.emit('pos');
socket.emit('pos', {channel: chan.toLowerCase()});
paused = false;
}
break;
@@ -118,7 +121,7 @@ var Player = {
/*if(window.mobilecheck() || embed)
{*/
paused = true;
Playercontrols.play_pause_show();
if(window.location.pathname != "/") Playercontrols.play_pause_show();
mobile_beginning = true;
/*}
else
@@ -158,7 +161,7 @@ var Player = {
curr_playing = Player.ytplayer.getVideoUrl().replace("https://www.youtube.com/watch?v=", "");
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass});
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass, channel: chan.toLowerCase});
//console.log(video_id, Player.ytplayer.getVideoUrl(), Player.ytplayer.getPlayerState());
/*}else{