diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 96588049e7..8c9d731666 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -710,10 +710,23 @@ progress { border-top: 2px solid #D7742B; } +#nowPlayingBar .highPosition { + z-index: 99999; + position: relative; +} - #nowPlayingBar > *:not(#mediaElement):not(.mediaFlyoutContainer) { - margin: 0 1em; - } +#nowPlayingBar .barBackground { + border-top: 2px solid #D7742B; + background: #4C4C4C; + position: absolute; + margin: -8px -0.5em !important; + width: 100%; + height: 100%; +} + +#nowPlayingBar > *:not(#mediaElement):not(.mediaFlyoutContainer) { + margin: 0 1em; +} .nowPlayingBarImage { border: 1px solid #a7a7a7!important; diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index e2b73bba59..378983521c 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -19,6 +19,8 @@ var curentDurationTicks; var isStaticStream; var culturesPromise; + var timeout; + var idleState = true; self.playlist = []; var currentPlaylistIndex = 0; @@ -687,7 +689,22 @@ return null; } - + + function idleHandler() { + var nowPlayingBar = $("#nowPlayingBar"); + if (timeout) { + window.clearTimeout(timeout); + } + if (idleState == true) { + $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).addClass("highPosition"); + } + idleState = false; + timeout = window.setTimeout(function () { + idleState = true; + $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).removeClass("highPosition"); + }, 4000); + } + self.canPlay = function (item) { if (item.Type == "MusicAlbum" || item.Type == "MusicArtist") { @@ -924,7 +941,8 @@ }; self.toggleFullscreen = function () { - + + $('.itemVideo').unbind('mousemove keydown scroll', idleHandler); if (isFullScreen()) { if (document.cancelFullScreen) { document.cancelFullScreen(); } else if (document.mozCancelFullScreen) { document.mozCancelFullScreen(); } @@ -935,6 +953,8 @@ } } else { + idleState = true; + $('.itemVideo').bind('mousemove keydown scroll', idleHandler).trigger('mousemove'); requestFullScreen(document.body); } }; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index f790093b20..8c3b06444a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1054,6 +1054,7 @@ $(function () { var footerHtml = '