Skip to content
Snippets Groups Projects
Verified Commit 6da52908 authored by Loïs Poujade's avatar Loïs Poujade
Browse files

Hide annotation autoscroll button if not on video

+ remove unwanted property
parent cff6b420
Branches
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ import SyncDisabledIcon from '@material-ui/icons/SyncDisabled'; ...@@ -5,6 +5,7 @@ import SyncDisabledIcon from '@material-ui/icons/SyncDisabled';
import VisibilityIcon from '@material-ui/icons/VisibilitySharp'; import VisibilityIcon from '@material-ui/icons/VisibilitySharp';
import VisibilityOffIcon from '@material-ui/icons/VisibilityOffSharp'; import VisibilityOffIcon from '@material-ui/icons/VisibilityOffSharp';
import MiradorMenuButton from '../containers/MiradorMenuButton'; import MiradorMenuButton from '../containers/MiradorMenuButton';
import { VideoViewersReferences } from '../plugins/VideoViewersReferences';
/** /**
* AnnotationSettings is a component to handle various annotation * AnnotationSettings is a component to handle various annotation
...@@ -16,10 +17,12 @@ export class AnnotationSettings extends Component { ...@@ -16,10 +17,12 @@ export class AnnotationSettings extends Component {
*/ */
render() { render() {
const { const {
autoScroll, autoScrollDisabled, windowId, autoScroll, autoScrollDisabled,
displayAll, displayAllDisabled, t, toggleAnnotationAutoScroll, toggleAnnotationDisplay, displayAll, displayAllDisabled, t, toggleAnnotationAutoScroll, toggleAnnotationDisplay,
} = this.props; } = this.props;
const mediaIsVideo = typeof VideoViewersReferences.get(windowId) !== 'undefined';
return ( return (
<> <>
<MiradorMenuButton <MiradorMenuButton
...@@ -30,6 +33,7 @@ export class AnnotationSettings extends Component { ...@@ -30,6 +33,7 @@ export class AnnotationSettings extends Component {
> >
{ displayAll ? <VisibilityIcon /> : <VisibilityOffIcon /> } { displayAll ? <VisibilityIcon /> : <VisibilityOffIcon /> }
</MiradorMenuButton> </MiradorMenuButton>
{ mediaIsVideo && (
<MiradorMenuButton <MiradorMenuButton
aria-label={autoScroll ? 'Disable auto scroll' : 'Enable auto scroll'} aria-label={autoScroll ? 'Disable auto scroll' : 'Enable auto scroll'}
onClick={toggleAnnotationAutoScroll} onClick={toggleAnnotationAutoScroll}
...@@ -38,6 +42,7 @@ export class AnnotationSettings extends Component { ...@@ -38,6 +42,7 @@ export class AnnotationSettings extends Component {
> >
{ autoScroll ? <SyncIcon /> : <SyncDisabledIcon /> } { autoScroll ? <SyncIcon /> : <SyncDisabledIcon /> }
</MiradorMenuButton> </MiradorMenuButton>
)}
</> </>
); );
} }
......
...@@ -75,7 +75,6 @@ export const windowsReducer = (state = {}, action) => { ...@@ -75,7 +75,6 @@ export const windowsReducer = (state = {}, action) => {
{ {
...(orig || {}), ...(orig || {}),
canvasId: action.canvasId, canvasId: action.canvasId,
currentTime: 0,
visibleCanvases: action.visibleCanvases || [], visibleCanvases: action.visibleCanvases || [],
}), state); }), state);
case ActionTypes.ADD_COMPANION_WINDOW: case ActionTypes.ADD_COMPANION_WINDOW:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment