mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-12-08 20:48:48 +00:00
Added open in YouTube button on search, and setting start/endtime of YouTube video.
- Opening for further development with userset end/starttime
This commit is contained in:
@@ -1669,6 +1669,20 @@ nav ul li:hover, nav ul li.active {
|
|||||||
color:orange;
|
color:orange;
|
||||||
}
|
}
|
||||||
#add-many i{ line-height: 36px !important;}
|
#add-many i{ line-height: 36px !important;}
|
||||||
|
|
||||||
|
.open-externally {
|
||||||
|
float:right;
|
||||||
|
color:white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.open-externally:hover {
|
||||||
|
color:orange;
|
||||||
|
}
|
||||||
|
|
||||||
|
.open-externally i {
|
||||||
|
line-height: 36px !important;
|
||||||
|
}
|
||||||
|
|
||||||
#results{
|
#results{
|
||||||
background-color: rgba(0,0,0,0.8);
|
background-color: rgba(0,0,0,0.8);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
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
@@ -757,8 +757,10 @@ function spotify_is_authenticated(bool){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
window.enable_debug = enable_debug;
|
window.zoff = {
|
||||||
window.disable_debug = disable_debug;
|
enable_debug: enable_debug,
|
||||||
|
disable_debug: disable_debug
|
||||||
|
}
|
||||||
|
|
||||||
function seekToMove(e){
|
function seekToMove(e){
|
||||||
var pos_x = e.clientX - Math.ceil($("#seekToDuration").width() / 2) - 8;
|
var pos_x = e.clientX - Math.ceil($("#seekToDuration").width() / 2) - 8;
|
||||||
@@ -1450,12 +1452,12 @@ $(window).resize(function(){
|
|||||||
|
|
||||||
$(document).on( "click", ".result-object", function(e){
|
$(document).on( "click", ".result-object", function(e){
|
||||||
var $html = $(e.target);
|
var $html = $(e.target);
|
||||||
|
|
||||||
var substr = $html.prop('outerHTML').substring(0,4);
|
var substr = $html.prop('outerHTML').substring(0,4);
|
||||||
if(substr != "<i c"){
|
if(substr != "<i c" && $html.prop('class').indexOf("waves-effect") == -1){
|
||||||
var id = $(this).attr("data-video-id");
|
var id = $(this).attr("data-video-id");
|
||||||
var title = $(this).attr("data-video-title");
|
var title = $(this).attr("data-video-title");
|
||||||
var length = $(this).attr("data-video-length");
|
var length = $(this).attr("data-video-length");
|
||||||
|
|
||||||
Search.submitAndClose(id, title, length);
|
Search.submitAndClose(id, title, length);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ var Player = {
|
|||||||
|
|
||||||
try{
|
try{
|
||||||
if(Player.player.getVideoUrl().split('v=')[1] != video_id || chromecastAvailable){
|
if(Player.player.getVideoUrl().split('v=')[1] != video_id || chromecastAvailable){
|
||||||
Player.loadVideoById(video_id);
|
Player.loadVideoById(video_id, duration);
|
||||||
if(!Helper.mobilecheck()) {
|
if(!Helper.mobilecheck()) {
|
||||||
Player.notifyUser(video_id, song_title);
|
Player.notifyUser(video_id, song_title);
|
||||||
}
|
}
|
||||||
@@ -120,7 +120,7 @@ var Player = {
|
|||||||
}
|
}
|
||||||
}catch(e){
|
}catch(e){
|
||||||
if(chromecastAvailable){
|
if(chromecastAvailable){
|
||||||
Player.loadVideoById(video_id);
|
Player.loadVideoById(video_id, duration);
|
||||||
Player.seekTo(seekTo);
|
Player.seekTo(seekTo);
|
||||||
}
|
}
|
||||||
if(!durationBegun && !chromecastAvailable) {
|
if(!durationBegun && !chromecastAvailable) {
|
||||||
@@ -238,13 +238,13 @@ var Player = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
loadVideoById: function(id){
|
loadVideoById: function(id, this_duration){
|
||||||
if(chromecastAvailable){
|
if(chromecastAvailable){
|
||||||
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: id});
|
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: id});
|
||||||
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg'});
|
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg'});
|
||||||
chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
|
chrome.cast.Image('https://img.youtube.com/vi/'+id+'/mqdefault.jpg');
|
||||||
} else {
|
} else {
|
||||||
Player.player.loadVideoById(id, 0);
|
Player.player.loadVideoById({'videoId': id, 'startSeconds': 0, 'endSeconds': this_duration});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -279,7 +279,7 @@ var Player = {
|
|||||||
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
|
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg'});
|
||||||
chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
|
chrome.cast.Image('https://img.youtube.com/vi/'+video_id+'/mqdefault.jpg');
|
||||||
} else {
|
} else {
|
||||||
Player.loadVideoById(video_id);
|
Player.loadVideoById(video_id, duration);
|
||||||
}
|
}
|
||||||
List.channel_function({type:"song_change", time: time});
|
List.channel_function({type:"song_change", time: time});
|
||||||
},
|
},
|
||||||
@@ -322,7 +322,7 @@ var Player = {
|
|||||||
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
|
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
|
||||||
|
|
||||||
} else if(video_id !== undefined) {
|
} else if(video_id !== undefined) {
|
||||||
Player.loadVideoById(video_id);
|
Player.loadVideoById(video_id, duration);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -341,7 +341,7 @@ var Player = {
|
|||||||
$("#player").css("opacity", "1");
|
$("#player").css("opacity", "1");
|
||||||
$("#controls").css("opacity", "1");
|
$("#controls").css("opacity", "1");
|
||||||
$(".playlist").css("opacity", "1");
|
$(".playlist").css("opacity", "1");
|
||||||
Player.loadVideoById(video_id);
|
Player.loadVideoById(video_id, duration);
|
||||||
if(autoplay && (!Helper.mobilecheck() || chromecastAvailable)) {
|
if(autoplay && (!Helper.mobilecheck() || chromecastAvailable)) {
|
||||||
Player.playVideo();
|
Player.playVideo();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,6 +93,7 @@ var Search = {
|
|||||||
songs.find("#temp-results").attr("data-video-id", id);
|
songs.find("#temp-results").attr("data-video-id", id);
|
||||||
songs.find("#temp-results").attr("data-video-title", enc_title);
|
songs.find("#temp-results").attr("data-video-title", enc_title);
|
||||||
songs.find("#temp-results").attr("data-video-length", secs);
|
songs.find("#temp-results").attr("data-video-length", secs);
|
||||||
|
songs.find(".open-externally").attr("href", "https://www.youtube.com/watch?v=" + id);
|
||||||
//$($(songs).find("div")[0]).attr("id", id)
|
//$($(songs).find("div")[0]).attr("id", id)
|
||||||
//output += undefined;
|
//output += undefined;
|
||||||
if(songs.html() != undefined) {
|
if(songs.html() != undefined) {
|
||||||
|
|||||||
@@ -73,10 +73,12 @@
|
|||||||
|
|
||||||
<div class="search-title truncate"></div>
|
<div class="search-title truncate"></div>
|
||||||
<span class="result_info"></span>
|
<span class="result_info"></span>
|
||||||
|
|
||||||
<div class="waves-effect waves-orange btn-flat" id="add-many" title="Add several videos">
|
<div class="waves-effect waves-orange btn-flat" id="add-many" title="Add several videos">
|
||||||
<i class="material-icons">playlist_add</i>
|
<i class="material-icons">playlist_add</i>
|
||||||
</div>
|
</div>
|
||||||
|
<a href="#" target="_blank" class="waves-effect waves-orange btn-flat open-externally" title="Open on YouTube">
|
||||||
|
<i class="material-icons">open_in_new</i>
|
||||||
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user