Skip to content
Snippets Groups Projects
Commit efa6839a authored by Antoine Roy's avatar Antoine Roy
Browse files

Tentative de rendre compatible le plugin annotation avec Mirador qui fonctionne avec React 17

parent e9853d36
No related branches found
No related tags found
1 merge request!9Antoine plugin with mui5 react17
Pipeline #1633 failed
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
"@material-ui/icons": "^4.9.1", "@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.52", "@material-ui/lab": "^4.0.0-alpha.52",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador/mirador-video#annotation-on-video", "mirador": "git+https://github.com/ProjectMirador/mirador/pull/3648",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.8", "react": "^17.0.0",
"react-dom": "^16.8", "react-dom": "^17.0.0",
"uuid": "^8.0.0" "uuid": "^8.0.0"
}, },
"devDependencies": { "devDependencies": {
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
"jest-canvas-mock": "^2.2.0", "jest-canvas-mock": "^2.2.0",
"jest-junit": "^15.0.0", "jest-junit": "^15.0.0",
"jest-localstorage-mock": "^2.4.2", "jest-localstorage-mock": "^2.4.2",
"mirador": "git+https://gitlab.tetras-libre.fr/iiif/mirador/mirador-video#annotation-on-video", "mirador": "git+https://github.com/ProjectMirador/mirador/pull/3648",
"nwb": "^0.24.7", "nwb": "^0.24.7",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.8", "react": "^17.0.0",
"react-dom": "^16.8", "react-dom": "^17.0",
"uuid": "^8.2.0" "uuid": "^8.2.0"
}, },
"author": "", "author": "",
......
...@@ -411,9 +411,6 @@ class AnnotationCreation extends Component { ...@@ -411,9 +411,6 @@ class AnnotationCreation extends Component {
{ mediaIsVideo && ( { mediaIsVideo && (
<> <>
<Grid item xs={12} className={classes.paper}> <Grid item xs={12} className={classes.paper}>
<Typography>
{mediaIsVideo ? mediaVideo?.video.duration : null}
</Typography>
<Typography id="range-slider" variant="overline"> <Typography id="range-slider" variant="overline">
Display period Display period
</Typography> </Typography>
...@@ -425,6 +422,7 @@ class AnnotationCreation extends Component { ...@@ -425,6 +422,7 @@ class AnnotationCreation extends Component {
getAriaValueText={this.valuetextTime} getAriaValueText={this.valuetextTime}
max={mediaVideo ? mediaVideo.video.duration : null} max={mediaVideo ? mediaVideo.video.duration : null}
color="secondary" color="secondary"
windowId={windowId}
classes={{ classes={{
root: classes.MuiSliderColorSecondary, root: classes.MuiSliderColorSecondary,
}} }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment