KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-24 08:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed where the playeroverlay doesn't show on channels without songs

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-10 16:24:04 +01:00
parent 2fa9eb763a
commit 31a661eb57
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/dist/embed.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/dist/frontpage.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/dist/main.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
static/js/helpers.js
+6
View File
@@ -172,6 +172,12 @@ var Helper = {
return string.substring(0,1).toUpperCase()+string.substring(1).toLowerCase(); return string.substring(0,1).toUpperCase()+string.substring(1).toLowerCase();
}, },
addClass: function(object, toAdd){
if(!Helper.contains($(object).attr("class").split(" "), toAdd)){
$(object).addClass(toAdd);
}
},
send_mail: function(from, message){ send_mail: function(from, message){
static/js/youtube.js
+3 -3
View File
@@ -12,7 +12,7 @@ var Youtube = {
{ {
Youtube.loaded = false; Youtube.loaded = false;
if(obj[0].length == 0){ if(obj.length == 0){
document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!"; document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";
$("#player_overlay").height($("#player").height()); $("#player_overlay").height($("#player").height());
@@ -36,8 +36,6 @@ var Youtube = {
seekTo = time - conf["startTime"]; seekTo = time - conf["startTime"];
song_title = obj[0][0]["title"]; song_title = obj[0][0]["title"];
$("#player_overlay").addClass("hide");
try{ try{
Suggestions.fetchYoutubeSuggests(video_id); Suggestions.fetchYoutubeSuggests(video_id);
}catch(e){} }catch(e){}
@@ -64,6 +62,7 @@ var Youtube = {
if(Youtube.ytplayer.getDuration() > seekTo || Youtube.ytplayer.getDuration() == 0) if(Youtube.ytplayer.getDuration() > seekTo || Youtube.ytplayer.getDuration() == 0)
Youtube.ytplayer.seekTo(seekTo); Youtube.ytplayer.seekTo(seekTo);
Youtube.after_load = video_id; Youtube.after_load = video_id;
setTimeout(function(){Youtube.loaded = true;},500); setTimeout(function(){Youtube.loaded = true;},500);
}catch(e){Youtube.durationSetter();} }catch(e){Youtube.durationSetter();}
} }
@@ -98,6 +97,7 @@ var Youtube = {
Youtube.ytplayer.pauseVideo(); Youtube.ytplayer.pauseVideo();
beginning = false; beginning = false;
} }
Helper.addClass("#player_overlay", "hide");
if(document.getElementById("play").className.split(" ").length == 1) if(document.getElementById("play").className.split(" ").length == 1)
$("#play").toggleClass("hide"); $("#play").toggleClass("hide");
if(document.getElementById("pause").className.split(" ").length == 2) if(document.getElementById("pause").className.split(" ").length == 2)