Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-04-21 15:52:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

metaItem not required for InfoMenu

Browse source
This commit is contained in:
nklhrstv 2020-04-01 15:39:36 +03:00
parent 8d9239acbf
commit 5cc640871c
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/routes/Player/ControlBar/ControlBar.js
View file

@ -15,7 +15,6 @@ const ControlBar = ({
volume, volume,
muted, muted,
subtitlesTracks, subtitlesTracks,
metaItem,
stream, stream,
onPlayRequested, onPlayRequested,
onPauseRequested, onPauseRequested,
@ -98,7 +97,7 @@ const ControlBar = ({
<Button className={classnames(styles['control-bar-button'], 'disabled')} tabIndex={-1}> <Button className={classnames(styles['control-bar-button'], 'disabled')} tabIndex={-1}>
<Icon className={styles['icon']} icon={'ic_network'} /> <Icon className={styles['icon']} icon={'ic_network'} />
</Button> </Button>
<Button className={classnames(styles['control-bar-button'], { 'disabled': typeof metaItem !== 'object' || metaItem === null || typeof stream !== 'object' || stream === null })} tabIndex={-1} onMouseDown={onInfoButtonMouseDown} onClick={onInfoButtonClick}> <Button className={classnames(styles['control-bar-button'], { 'disabled': typeof stream !== 'object' || stream === null })} tabIndex={-1} onMouseDown={onInfoButtonMouseDown} onClick={onInfoButtonClick}>
<Icon className={styles['icon']} icon={'ic_info'} /> <Icon className={styles['icon']} icon={'ic_info'} />
</Button> </Button>
<Button className={classnames(styles['control-bar-button'], 'disabled')} tabIndex={-1}> <Button className={classnames(styles['control-bar-button'], 'disabled')} tabIndex={-1}>
@ -123,7 +122,6 @@ ControlBar.propTypes = {
volume: PropTypes.number, volume: PropTypes.number,
muted: PropTypes.bool, muted: PropTypes.bool,
subtitlesTracks: PropTypes.array, subtitlesTracks: PropTypes.array,
metaItem: PropTypes.object,
stream: PropTypes.object, stream: PropTypes.object,
onPlayRequested: PropTypes.func, onPlayRequested: PropTypes.func,
onPauseRequested: PropTypes.func, onPauseRequested: PropTypes.func,

5
src/routes/Player/Player.js
View file

@ -296,7 +296,7 @@ const Player = ({ urlParams }) => {
} }
case 'KeyM': { case 'KeyM': {
closeSubtitlesMenu(); closeSubtitlesMenu();
if (typeof metaItem === 'object' && metaItem !== null && typeof stream === 'object' && stream !== null) { if (typeof stream === 'object' && stream !== null) {
toggleInfoMenu(); toggleInfoMenu();
} }
@ -315,7 +315,7 @@ const Player = ({ urlParams }) => {
return () => { return () => {
window.removeEventListener('keydown', onKeyDown); window.removeEventListener('keydown', onKeyDown);
}; };
}, [routeFocused, subtitlesMenuOpen, infoMenuOpen, stream, metaItem, videoState.paused, videoState.time, videoState.volume, videoState.subtitlesTracks, toggleSubtitlesMenu, toggleInfoMenu]); }, [routeFocused, subtitlesMenuOpen, infoMenuOpen, stream, videoState.paused, videoState.time, videoState.volume, videoState.subtitlesTracks, toggleSubtitlesMenu, toggleInfoMenu]);
React.useLayoutEffect(() => { React.useLayoutEffect(() => {
return () => { return () => {
setImmersedDebounced.cancel(); setImmersedDebounced.cancel();
@ -384,7 +384,6 @@ const Player = ({ urlParams }) => {
muted={videoState.muted} muted={videoState.muted}
subtitlesTracks={videoState.subtitlesTracks} subtitlesTracks={videoState.subtitlesTracks}
stream={stream} stream={stream}
metaItem={metaItem}
onPlayRequested={onPlayRequested} onPlayRequested={onPlayRequested}
onPauseRequested={onPauseRequested} onPauseRequested={onPauseRequested}
onMuteRequested={onMuteRequested} onMuteRequested={onMuteRequested}