Merge with use-publicFolder

This commit is contained in:
Cássio Zen
2016-11-17 15:36:57 -02:00
3 changed files with 27 additions and 8 deletions

View File

@ -3,6 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import Waypoint from 'react-waypoint';
import { Map } from 'immutable';
import history from '../../routing/history';
import { resolvePath } from '../../lib/pathHelper';
import { selectFields, selectInferedField } from '../../reducers/collections';
import { Card } from '../UI';
import styles from './EntryListing.css';
@ -39,9 +40,7 @@ export default class EntryListing extends React.Component {
const label = entry.get('label');
const title = label || entry.getIn(['data', inferedFields.titleField]);
let image = entry.getIn(['data', inferedFields.imageField]);
if (image && image.indexOf('/') === -1) {
image = `/${ publicFolder }/${ image }`;
}
image = resolvePath(image, publicFolder);
return (
<Card
key={entry.get('slug')}