diff --git a/fuel/app/views/stream/index.php b/fuel/app/views/stream/index.php index 1842adb..311ef16 100644 --- a/fuel/app/views/stream/index.php +++ b/fuel/app/views/stream/index.php @@ -1,5 +1,5 @@ - - + + @@ -48,18 +48,11 @@ id === $episode->id) : ?> + style="left: 0px; width: 3px; background-color: rgb(249, 190, 3); transition-duration: 467.145ms; transform: scaleY(0.9);"> + style="left: 5px; width: 3px; background-color: rgb(249, 190, 3); transition-duration: 409.912ms; transform: scaleY(0.9);"> - - - - + style="left: 9.5px; width: 3px; background-color: rgb(249, 190, 3); transition-duration: 477.391ms; transform: scaleY(0.9);"> @@ -88,10 +81,23 @@ - title; ?> + title; ?> + type === 'movie') : ?> year; ?> + data-qa-id="metadataYear">year; ?> + + + + + S1 + · + E26 + + — + VOSTFR (BDRip + + getDuration(); ?> @@ -137,6 +143,18 @@ + + + Fermer + + $episode) : ?> + id === $episode->id && isset($episodes[$index + 1])) : ?> + + Episode suivant + + + + @@ -259,7 +277,7 @@ class="VolumeSlider-track-2WJDz Slider-track-28JOS"> + class="Slider-thumbTrack-21hGV" style="transform: translateX(-100%);"> 97) { + showNext(); + } else { + removeNext(); + } } } }); @@ -63,27 +93,27 @@ function launchPlayer(view) { player.on(Clappr.Events.PLAYER_PLAY, function(){player.core.mediaControl.disable()}); /** EVENT PLAYER WHEN LOADED GET TOTATL TIME **/ - player.core.getCurrentContainer().on(Clappr.Events.CONTAINER_LOADEDMETADATA, function(metadata) { + player.core.activeContainer.on(Clappr.Events.CONTAINER_LOADEDMETADATA, function(metadata) { totaltime = metadata.duration; }); /** EVENT PLAYER TO GET CURRENT TIME **/ /** BUFFER BAR PROGRESS **/ - player.core.getCurrentContainer().on(Clappr.Events.CONTAINER_PROGRESS, function(progress) { + player.core.activeContainer.on(Clappr.Events.CONTAINER_PROGRESS, function(progress) { var buffer = progress.current / progress.total; $('.SeekBar-seekBarBuffer-3bUz9').css('transform', 'scaleX('+ buffer +')'); }); /** PLAY CENTER **/ $(document).on('click', 'button[role="playCenter"]', function () { - $('button[role="playCenter"]').hide(); - $(document).find('button[data-qa-id="resumeButton"] > i').toggleClass('plex-icon-player-play-560 plex-icon-player-pause-560'); + $(document).find('button[role="playCenter"]').hide(); + $(document).find('button[data-qa-id="resumeButton"] i').toggleClass('plex-icon-player-pause-560 plex-icon-player-play-560'); player.play(); }); /** RESUME **/ $(document).on('click', 'button[data-qa-id="resumeButton"]', function () { if(!player.isPlaying()) - $('button[role="playCenter"]').click(); + $(document).find('button[role="playCenter"]').click(); else player.pause(); }); @@ -118,31 +148,74 @@ function launchPlayer(view) { }); /** HOVER PLAYER, BUTTON CENTER AND NAVBAR SHOW NAVBAR **/ - $(document).on('mouseover', '#movie_stream , button[role="playCenter"], .AudioVideoFullPlayer-topBar-2XUGM, .AudioVideoFullPlayer-bottomBar-2yixi, .AudioVideoPlaybackSettings-container-2pTAj.AudioVideoStripeContainer-container-MI02O', function (event) { + $(document).on('mouseover', '#divVideo, #movie_stream , button[role="playCenter"], .AudioVideoFullPlayer-topBar-2XUGM, .AudioVideoFullPlayer-bottomBar-2yixi, .AudioVideoPlaybackSettings-container-2pTAj.AudioVideoStripeContainer-container-MI02O', function (event) { clearTimeout(timeout); $('.AudioVideoFullPlayer-topBar-2XUGM').css('transform', 'translateY(60px)'); $('.AudioVideoFullPlayer-bottomBar-2yixi').css('transform', 'translateY(-86px)'); }); /** BUTTON CENTER AND NAVBAR HIDE NAVBAR **/ - $(document).on('mouseleave', '#movie_stream, #video_controls', function (event) { + $(document).on('mouseleave', '#divVideo, #movie_stream, #video_controls', function (event) { $('.AudioVideoFullPlayer-topBar-2XUGM').css('transform', ''); $('.AudioVideoFullPlayer-bottomBar-2yixi').css('transform', ''); $('.AudioVideoPlaybackSettings-container-2pTAj.AudioVideoStripeContainer-container-MI02O').css('transform', 'translateY(246px)'); }); /** MOUSE MOVE ON PLAYER KEEP VISIBLE NAVBAR **/ - $(document).on('mousemove', '#movie_stream, button[role="playCenter"]', function () { - $('button[role="playCenter"], #movie_stream').css('cursor', 'pointer'); + $(document).on('mousemove', '#divVideo, #movie_stream, button[role="playCenter"]', function () { + $('button[role="playCenter"], #movie_stream, video').css('cursor', 'pointer'); $('button[role="playCenter"], .AudioVideoFullPlayer-topBar-2XUGM, .AudioVideoFullPlayer-bottomBar-2yixi').mouseover(); lastTimeMouseMoved = new Date().getTime(); timeout = setInterval(function() { var currentTime = new Date().getTime(); if ((currentTime - lastTimeMouseMoved) > 1000) { - $('button[role="playCenter"], #movie_stream').css('cursor', 'none'); + $('button[role="playCenter"], #movie_stream, video').css('cursor', 'none'); $('#movie_stream, #video_controls').mouseleave(); clearTimeout(timeout); } }, 1000); }); + + /** NEXT EPISODE **/ + $(document).on('click', '#next', function () { + var movie_id = $(this).data('id'); + if (movie_id === '') + return; + + event.stopPropagation(); + + $.ajax({ + url: '/rest/movie/stream', + method: 'GET', + data: {movie_id: movie_id}, + dataType: 'html' + }).done(function (view) { + launchPlayer(view); + }).fail(function (data) { + console.error(data.responseText); + show_alert('error', data.responseText); + }); + }) +} + +function showNext() { + $('#movie_stream').css({ + 'position': 'relative', + 'height': '240px', + 'width': '380px', + 'top': '100px', + 'left': '200px' + }); + $('.Next').removeClass('hidden'); +} + +function removeNext() { + $('#movie_stream').css({ + 'position': 'relative', + 'height': '100%', + 'width': '100%', + 'top': 0, + 'left': 0 + }); + $('.Next').addClass('hidden'); } // Enter full screen @@ -205,14 +278,14 @@ function exitFullScreen() { // Initialise Sliders on the page function initSliders () { - var slider1 = new Slider($('.Slider-thumbTrack-21hGV .Slider-thumb-2QGiU').get(0)); - slider1.clickElementBefore = $('.SeekBar-seekBarTrack-3Gu5R').get(0); - slider1.init(); + sliderTrack = new Slider($('.Slider-thumbTrack-21hGV .Slider-thumb-2QGiU').get(0)); + sliderTrack.clickElementBefore = $('.SeekBar-seekBarTrack-3Gu5R').get(0); + sliderTrack.init(); - var slider2 = new Slider($('.VolumeSlider-slider-1QXdT .Slider-thumb-2QGiU').get(0)); - slider2.clickElementBefore = $('.VolumeSlider-fill-3XkYy').get(0); - slider2.clickElementAfter = $('.VolumeSlider-track-2WJDz').get(0); - slider2.init(); + sliderSound = new Slider($('.VolumeSlider-slider-1QXdT .Slider-thumb-2QGiU').get(0)); + sliderSound.clickElementBefore = $('.VolumeSlider-fill-3XkYy').get(0); + sliderSound.clickElementAfter = $('.VolumeSlider-track-2WJDz').get(0); + sliderSound.init(); }; @@ -293,7 +366,7 @@ Slider.prototype.moveSliderTo = function (value) { if(this.domNode.id === 'buttonTrack') { document.getElementsByClassName('SeekBar-seekBarFill-1Lcu0')[0].style.transform = 'scaleX(' + percent / 100 + ')'; - if(player && player.isPlaying()) { + if(player) { player.seekPercentage(percent); } } @@ -312,12 +385,20 @@ Slider.prototype.handleKeyDown = function (event) { switch (event.keyCode) { case this.keyCode.left: + this.moveSliderTo(this.valueNow - 1); + flag = true; + break; + case this.keyCode.down: this.moveSliderTo(this.valueNow - 1); flag = true; break; case this.keyCode.right: + this.moveSliderTo(this.valueNow + 1); + flag = true; + break; + case this.keyCode.up: this.moveSliderTo(this.valueNow + 1); flag = true;