fixed issue with player not always showing up with a video, and skipping to fast not always changing the video

This commit is contained in:
Kasper Rynning-Tønnesen
2017-06-19 23:21:25 +02:00
parent bd950fc1e7
commit e6c7682380
6 changed files with 33 additions and 22 deletions

View File

@@ -1536,10 +1536,11 @@ ul #chat-log{
position: relative;
transform: translate(0%, 0%);
z-index: 99;
-webkit-transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out;
transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out;
-moz-transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out;
-o-transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out;
opacity: 0;
-webkit-transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out, opacity 1s;
transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out, opacity 1s;
-moz-transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out, opacity 1s;
-o-transition: transform .5s ease-out, width .5s ease-out, height .5s ease-out, opacity 1s;
}
#fireplace_player{

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -232,7 +232,7 @@ var List = {
List.dynamicContentPage(-10);
} else{
} else {
List.empty = true;
$("#wrapper").html("<span id='empty-channel-message'>The playlist is empty.</span>");
if(!$("#pageButtons").length){
@@ -502,9 +502,9 @@ var List = {
song_change: function(time, remove){
try{
var length = full_playlist.length-1;
var length = full_playlist.length - 1;
$("#wrapper").children()[0].remove();
if($("#wrapper").children().length === 0) {
if(full_playlist.length <= 1) {
List.empty = true;
$("#wrapper").html("<span id='empty-channel-message'>The playlist is empty.</span>");
}
@@ -524,7 +524,7 @@ var List = {
Helper.log("---------------------------");
full_playlist.push(full_playlist.shift());
if(!remove){
List.insertAtIndex(full_playlist[length-1], false, true);
List.insertAtIndex(full_playlist[$("#wrapper").children().length], false, true);
}
}catch(e){}

View File

@@ -100,11 +100,16 @@ var Player = {
Player.getTitle(song_title, viewers);
Player.setBGimage(video_id);
//if(player_ready && !Helper.mobilecheck())
if(player_ready && !window.MSStream)
{
if(player_ready && !window.MSStream) {
try {
var compared;
try {
compared = Player.player.getVideoUrl().split('v=')[1] != video_id;
} catch(e) {
compared = true;
}
if(compared || chromecastAvailable){
try{
if(Player.player.getVideoUrl().split('v=')[1] != video_id || chromecastAvailable){
Player.loadVideoById(video_id, duration);
if(!Helper.mobilecheck()) {
Player.notifyUser(video_id, song_title);
@@ -130,8 +135,8 @@ var Player = {
if(!Player.loaded) {
setTimeout(function(){Player.loaded = true;},500);
}
}catch(e){
if(chromecastAvailable){
}catch(e) {
if(chromecastAvailable) {
Player.loadVideoById(video_id, duration);
Player.seekTo(seekTo);
}
@@ -144,8 +149,9 @@ var Player = {
}
}
} else {
if(!durationBegun)
if(!durationBegun) {
Player.durationSetter();
}
duration = Player.player.getDuration();
}
},
@@ -174,6 +180,10 @@ var Player = {
}
break;
case 1:
if(!window.MSStream) {
$("#player").css("opacity", "1");
if(!Helper.mobilecheck()) $("#channel-load").css("display", "none");
}
playing = true;
if(beginning && Helper.mobilecheck() && !chromecastAvailable){
Player.pauseVideo();
@@ -353,10 +363,12 @@ var Player = {
if(Helper.mobilecheck()){
$("#playpause").css("visibility", "hidden");
$("#playpause").css("pointer-events", "none");
} else {
$("#channel-load").css("display", "none");
}
$("#player").css("opacity", "1");
} else {
//$("#channel-load").css("display", "none");
}
/*$("#player").css("opacity", "1");*/
$(".video-container").removeClass("no-opacity");
$("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1");
Player.loadVideoById(video_id, duration);
@@ -381,7 +393,6 @@ var Player = {
Playercontrols.initYoutubeControls(Player.player);
Playercontrols.initSlider();
Player.player.setVolume(Crypt.get_volume());
$(".video-container").removeClass("no-opacity");
}catch(e){}
},

View File

@@ -54,7 +54,6 @@ var Playercontrols = {
play_pause: function()
{
if(!chromecastAvailable){
console.log(Player.player.getPlayerState());
if(Player.player.getPlayerState() == 1)
{
Player.pauseVideo();