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

More chromecastfeatures

Browse Source 
- Click on player pauses/plays video
- Receives event on play/pause
- Some indentationfixes
- Not showing Join Channel modal when chromecast connected
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-26 18:45:17 +01:00
parent 78fad1bbe0
commit ce656b97bc
4 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/public/assets/js/functions.js
View File

@@ -108,19 +108,31 @@ function chromecastListener(evt, data) {
var json_parsed = JSON.parse(data); var json_parsed = JSON.parse(data);
switch(json_parsed.type){ switch(json_parsed.type){
case -1: case -1:
if(offline){ if(offline){
Player.playNext(); Player.playNext();
} else { } else {
socket.emit("end", {id: json_parsed.videoId, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("end", {id: json_parsed.videoId, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} }
break; break;
case 0: case 0:
if(offline){ if(offline){
Player.playNext(); Player.playNext();
} else { } else {
socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} }
break; break;
case 1:
if(!$("#play").hasClass("hide")) {
$("#play").addClass("hide");
}
$("#pause").removeClass("hide");
break;
case 2:
if(!$("#pause").hasClass("hide")) {
$("#pause").addClass("hide");
}
$("#play").removeClass("hide");
break;
} }
} }

2
server/public/assets/js/list.js
View File

@@ -842,7 +842,7 @@ var List = {
}, },
show: function() { show: function() {
if(!Helper.mobilecheck()) if(!Helper.mobilecheck() && !chromecastAvailable)
{ {
$("#channel-share-modal").modal("open"); $("#channel-share-modal").modal("open");
} }

6
server/public/assets/js/listeners.js
View File

@@ -327,6 +327,12 @@ initializeCastApi = function() {
} }
}; };
$(document).on("click", "#player_overlay", function(e) {
if(chromecastAvailable) {
Player.playPauseVideo();
}
});
$(document).on("click", "#bitcoin-address", function(e) { $(document).on("click", "#bitcoin-address", function(e) {
var copyTextarea = document.querySelector('#bitcoin-address'); var copyTextarea = document.querySelector('#bitcoin-address');
copyTextarea.select(); copyTextarea.select();

6
server/public/assets/js/player.js
View File

@@ -283,6 +283,12 @@ var Player = {
} }
}, },
playPauseVideo: function() {
if(chromecastAvailable) {
castSession.sendMessage("urn:x-cast:zoff.me", {type: "playPauseVideo"});
}
}
playVideo: function(){ playVideo: function(){
if(chromecastAvailable){ if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "playVideo"}); castSession.sendMessage("urn:x-cast:zoff.me", {type: "playVideo"});