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

Correct previous merge

parent 73bff104
No related branches found
No related tags found
3 merge requests!4Integrate upstream tests into gitlab ci,!3Update mirador code from official project,!2test gitlab ci (dont merge)
......@@ -52,25 +52,6 @@ module.exports = function (api) {
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }],
['@babel/plugin-transform-runtime', {
corejs: false,
helpers: false, // Needed to support IE/Edge
regenerator: true,
},
[
'@babel/plugin-proposal-class-properties',
{
loose: true,
},
],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
['@babel/plugin-proposal-private-methods', { loose: true }],
[
'@babel/plugin-proposal-object-rest-spread',
{
useBuiltIns: true,
},
],
[
'@babel/plugin-transform-runtime',
{
......
......@@ -183,7 +183,6 @@ export class VideoViewer extends Component {
VideoViewer.propTypes = {
annotations: PropTypes.arrayOf(PropTypes.object),
canvas: PropTypes.object, // eslint-disable-line react/forbid-prop-types
captions: PropTypes.arrayOf(PropTypes.object), // eslint-disable-line react/forbid-prop-types
classes: PropTypes.objectOf(PropTypes.string).isRequired,
currentTime: PropTypes.number,
muted: PropTypes.bool,
......@@ -193,7 +192,6 @@ VideoViewer.propTypes = {
setPaused: PropTypes.func,
textTrackDisabled: PropTypes.bool,
videoOptions: PropTypes.object, // eslint-disable-line react/forbid-prop-types
videoResources: PropTypes.arrayOf(PropTypes.object), // eslint-disable-line react/forbid-prop-types
windowId: PropTypes.string.isRequired,
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment