Don't hide header when moused over player controls

This commit is contained in:
DC
2016-09-23 02:38:39 -07:00
parent 5155fca0e4
commit 789bd0ce82
7 changed files with 36 additions and 19 deletions

View File

@@ -43,12 +43,7 @@ class App extends React.Component {
// * The mouse is over the controls or we're scrubbing (see CSS)
// * The video is paused
// * The video is playing remotely on Chromecast or Airplay
const hideControls = state.location.url() === 'player' &&
state.playing.mouseStationarySince !== 0 &&
new Date().getTime() - state.playing.mouseStationarySince > 2000 &&
!state.playing.isPaused &&
state.playing.location === 'local' &&
state.playing.playbackRate === 1
const hideControls = state.shouldHidePlayerControls()
const cls = [
'view-' + state.location.url(), /* e.g. view-home, view-player */

View File

@@ -438,7 +438,7 @@ function renderPlayerControls (state) {
]
if (state.playing.type === 'video') {
// show closed captions icon
// Show closed captions icon
elements.push((
<i
key='subtitles'
@@ -506,8 +506,6 @@ function renderPlayerControls (state) {
'color-stop(' + (volume * 100) + '%, #727272))'
}
// TODO: dcposch change the range input to use value / onChanged instead of
// "readonly" / onMouse[Down,Move,Up]
elements.push((
<div key='volume' className='volume float-left'>
<i
@@ -533,7 +531,7 @@ function renderPlayerControls (state) {
</span>
))
// render playback rate
// Render playback rate
if (state.playing.playbackRate !== 1) {
elements.push((
<span key='rate' className='rate float-left'>
@@ -543,7 +541,9 @@ function renderPlayerControls (state) {
}
return (
<div key='controls' className='controls'>
<div key='controls' className='controls'
onMouseEnter={dispatcher('mediaControlsMouseEnter')}
onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
{elements}
{renderCastOptions(state)}
{renderSubtitleOptions(state)}