mirror of
https://github.com/KevinMidboe/zoff.git
synced 2026-02-12 04:19:32 +00:00
More fixes for current playing, and enabling remotecontroller if specified
This commit is contained in:
@@ -15,7 +15,7 @@ gulp.task('js', function () {
|
|||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('embed', function () {
|
gulp.task('embed', function () {
|
||||||
gulp.src(['server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js'])
|
gulp.src(['server/public/assets/js/player.js', 'server/public/assets/js/helpers.js', 'server/public/assets/js/playercontrols.js', 'server/public/assets/js/list.js', 'server/public/assets/js/embed.js', '!server/public/assets/js/frontpage*', '!server/public/assets/js/remotecontroller.js', 'server/public/assets/js/hostcontroller.js'])
|
||||||
.pipe(uglify({
|
.pipe(uglify({
|
||||||
mangle: true,
|
mangle: true,
|
||||||
compress: true,
|
compress: true,
|
||||||
|
|||||||
@@ -11,6 +11,15 @@
|
|||||||
background-color: rgba(255, 255, 255, 0.04) !important;
|
background-color: rgba(255, 255, 255, 0.04) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#empty-channel-message {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
height: 100vh;
|
||||||
|
color: white;
|
||||||
|
font-size: 2em;
|
||||||
|
}
|
||||||
|
|
||||||
.noselect {
|
.noselect {
|
||||||
-webkit-touch-callout: none;
|
-webkit-touch-callout: none;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
|
|||||||
2
server/public/assets/dist/embed.min.js
vendored
2
server/public/assets/dist/embed.min.js
vendored
File diff suppressed because one or more lines are too long
2
server/public/assets/dist/main.min.js
vendored
2
server/public/assets/dist/main.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -13,6 +13,7 @@ var durationBegun = false;
|
|||||||
var chromecastAvailable = false;
|
var chromecastAvailable = false;
|
||||||
var private_channel = false;
|
var private_channel = false;
|
||||||
var offline = false;
|
var offline = false;
|
||||||
|
var began = false;
|
||||||
var from_frontpage = false;
|
var from_frontpage = false;
|
||||||
var seekTo;
|
var seekTo;
|
||||||
var socket;
|
var socket;
|
||||||
@@ -75,7 +76,7 @@ $(document).ready(function(){
|
|||||||
Player.getTitle(song_title, viewers);
|
Player.getTitle(song_title, viewers);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
setup_host_initialization();
|
||||||
setup_youtube_listener();
|
setup_youtube_listener();
|
||||||
setup_list_listener();
|
setup_list_listener();
|
||||||
|
|
||||||
@@ -88,8 +89,20 @@ $(document).ready(function(){
|
|||||||
window.setVolume = setVolume;
|
window.setVolume = setVolume;
|
||||||
$("#controls").css("background-color", color);
|
$("#controls").css("background-color", color);
|
||||||
$("#playlist").css("background-color", color);
|
$("#playlist").css("background-color", color);
|
||||||
|
if(hash.indexOf("controll") > -1) {
|
||||||
|
Hostcontroller.change_enabled(true);
|
||||||
|
} else {
|
||||||
|
Hostcontroller.change_enabled(false);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function setup_host_listener(id){
|
||||||
|
socket.on(id, Hostcontroller.host_on_action);
|
||||||
|
}
|
||||||
|
|
||||||
|
function setup_host_initialization(){
|
||||||
|
socket.on("id", Hostcontroller.host_listener);
|
||||||
|
}
|
||||||
|
|
||||||
function setup_youtube_listener(){
|
function setup_youtube_listener(){
|
||||||
socket.on("np", Player.youtube_listener);
|
socket.on("np", Player.youtube_listener);
|
||||||
|
|||||||
@@ -5,13 +5,17 @@ var Hostcontroller = {
|
|||||||
old_id: null,
|
old_id: null,
|
||||||
|
|
||||||
host_listener: function(id) {
|
host_listener: function(id) {
|
||||||
|
|
||||||
if(Hostcontroller.old_id === null) Hostcontroller.old_id = id;
|
if(Hostcontroller.old_id === null) Hostcontroller.old_id = id;
|
||||||
else {
|
else {
|
||||||
socket.removeAllListeners(id);
|
socket.removeAllListeners(id);
|
||||||
began = false;
|
began = false;
|
||||||
Hostcontroller.old_id = id;
|
Hostcontroller.old_id = id;
|
||||||
}
|
}
|
||||||
|
if(embed) {
|
||||||
|
if(window.parentWindow && window.parentOrigin) {
|
||||||
|
window.parentWindow.postMessage({type: "controller", id: id}, window.parentOrigin);
|
||||||
|
}
|
||||||
|
}
|
||||||
var codeURL = "https://remote."+window.location.hostname+"/"+id;
|
var codeURL = "https://remote."+window.location.hostname+"/"+id;
|
||||||
$("#code-text").text(id);
|
$("#code-text").text(id);
|
||||||
$("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
|
$("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
|
||||||
@@ -54,6 +58,7 @@ var Hostcontroller = {
|
|||||||
|
|
||||||
change_enabled:function(val){
|
change_enabled:function(val){
|
||||||
enabled = val;
|
enabled = val;
|
||||||
document.getElementsByName("remote_switch")[0].checked = enabled;
|
console.log(enabled);
|
||||||
|
$(".remote_switch_class").prop("checked", enabled);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,6 +10,14 @@ var Player = {
|
|||||||
youtube_listener: function(obj)
|
youtube_listener: function(obj)
|
||||||
{
|
{
|
||||||
var state;
|
var state;
|
||||||
|
if(embed && obj.np) {
|
||||||
|
if(window.parentWindow && window.parentOrigin) {
|
||||||
|
window.parentWindow.postMessage({type: "np", title: obj.np[0].title}, window.parentOrigin);
|
||||||
|
if(full_playlist.length > 0) {
|
||||||
|
Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
try{
|
try{
|
||||||
state = Player.player.getPlayerState();
|
state = Player.player.getPlayerState();
|
||||||
}catch(e){
|
}catch(e){
|
||||||
@@ -29,14 +37,6 @@ var Player = {
|
|||||||
} catch(e){}
|
} catch(e){}
|
||||||
Helper.log("video_id variable: " + video_id);
|
Helper.log("video_id variable: " + video_id);
|
||||||
Helper.log("---------------------------------");
|
Helper.log("---------------------------------");
|
||||||
if(embed && obj.np) {
|
|
||||||
if(window.parentWindow && window.parentOrigin) {
|
|
||||||
window.parentWindow.postMessage({type: "np", title: obj.np[0].title}, window.parentOrigin);
|
|
||||||
if(full_playlist.length > 0) {
|
|
||||||
Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!obj.np){
|
if(!obj.np){
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user