Skip to content
Snippets Groups Projects
Commit 3a48df55 authored by Glenn Fischer's avatar Glenn Fischer
Browse files

#1888: fixes build

parent b824b510
No related branches found
No related tags found
No related merge requests found
...@@ -101,13 +101,11 @@ export class ThumbnailNavigation extends Component { ...@@ -101,13 +101,11 @@ export class ThumbnailNavigation extends Component {
* canvases * canvases
*/ */
calculateScaledWidth(options) { calculateScaledWidth(options) {
<<<<<<< HEAD
const { config, canvasGroupings } = this.props; const { config, canvasGroupings } = this.props;
const ret = canvasGroupings return canvasGroupings
.getCanvases(options.index) .getCanvases(options.index)
.map(canvas => new ManifestoCanvas(canvas)) .map(canvas => new ManifestoCanvas(canvas))
.reduce((acc, currentCanvas) => { return acc + (currentCanvas.hasValidDimensions ? Math.floor(config.thumbnailNavigation.height * currentCanvas.aspectRatio) : config.thumbnailNavigation.width); }, 8); // eslint-disable-line arrow-body-style, max-len .reduce((acc, currentCanvas) => { return acc + (currentCanvas.hasValidDimensions ? Math.floor(config.thumbnailNavigation.height * currentCanvas.aspectRatio) : config.thumbnailNavigation.width); }, 8); // eslint-disable-line arrow-body-style, max-len
return ret;
} }
/** /**
...@@ -121,16 +119,6 @@ export class ThumbnailNavigation extends Component { ...@@ -121,16 +119,6 @@ export class ThumbnailNavigation extends Component {
return Math.ceil(window.canvasIndex / 2); return Math.ceil(window.canvasIndex / 2);
default: default:
return window.canvasIndex; return window.canvasIndex;
=======
const { config, canvases } = this.props;
const canvas = new ManifestoCanvas(canvases[options.index]);
/*
if canvas provides valid dimensions return calculated width, based on height and aspectRatio,
otherweise return the default width
*/
if (canvas.hasValidDimensions) {
return Math.floor(config.thumbnailNavigation.height * canvas.aspectRatio) + 8;
>>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
} }
} }
......
...@@ -4,14 +4,8 @@ import classNames from 'classnames'; ...@@ -4,14 +4,8 @@ import classNames from 'classnames';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
import List from '@material-ui/core/List'; import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem'; import ListItem from '@material-ui/core/ListItem';
<<<<<<< HEAD
import { CanvasThumbnail } from './CanvasThumbnail'; import { CanvasThumbnail } from './CanvasThumbnail';
import ManifestoCanvas from '../lib/ManifestoCanvas'; import ManifestoCanvas from '../lib/ManifestoCanvas';
=======
import { withStyles } from '@material-ui/core/styles';
import ManifestoCanvas from '../lib/ManifestoCanvas';
import CanvasThumbnail from './CanvasThumbnail';
>>>>>>> #1888 fixes import for ManifestoCanvas, re-adds padding for thumbnail grid cell
import { getIdAndLabelOfCanvases } from '../state/selectors'; import { getIdAndLabelOfCanvases } from '../state/selectors';
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment