diff --git a/www/js/beauty.js b/www/js/beauty.js index b077052..fbdb0b8 100644 --- a/www/js/beauty.js +++ b/www/js/beauty.js @@ -638,7 +638,8 @@ if ($('#my-player').length > 0 && typeof(videojs) != 'undefined') { }; //加载更多视频 - var currentPage = $('.othervideos').attr('data-page'); + var currentPage = $('.othervideos').attr('data-page'), + currentVideoId = $('.othervideos').attr('data-id'); var getOtherVideos = function(currentPage) { if (_noMoreVideos) {return false;} var videoId = $('.othervideos').attr('data-id'), @@ -683,10 +684,17 @@ if ($('#my-player').length > 0 && typeof(videojs) != 'undefined') { myPlayer.on('ended', function() { var cachedAutoPlayStatus = Cookies.get('autoplay'); if (cachedAutoPlayStatus == 'off') {return false;} - + if (moreVideos && moreVideos.length > 0) { var nextVideo = moreVideos.shift(); - myPlayer.src(nextVideo.path); + if (nextVideo.id == currentVideoId && moreVideos.length > 0) { + nextVideo = moreVideos.shift(); + } + + if (nextVideo) { + myPlayer.src(nextVideo.path); + $('.navbar-header .videotitle').text(nextVideo.filename); + } }else { currentPage = parseInt(currentPage) + 1; getOtherVideos(currentPage);