diff options
Diffstat (limited to 'animism-align/frontend/app')
10 files changed, 15 insertions, 4 deletions
diff --git a/animism-align/frontend/app/views/audio/audio.actions.js b/animism-align/frontend/app/views/audio/audio.actions.js index 08a8ba4..4627e90 100644 --- a/animism-align/frontend/app/views/audio/audio.actions.js +++ b/animism-align/frontend/app/views/audio/audio.actions.js @@ -27,7 +27,7 @@ export const load = (url) => dispatch => { }) } export const loadEpisodeAudio = (episode) => dispatch => { - return load(episode.settings.audio.url)(dispatch) + return episode.settings.audio ? load(episode.settings.audio.url)(dispatch) : null } export const play = () => dispatch => { diff --git a/animism-align/frontend/app/views/editor/align/align.actions.js b/animism-align/frontend/app/views/editor/align/align.actions.js index 3b6450b..fe5020c 100644 --- a/animism-align/frontend/app/views/editor/align/align.actions.js +++ b/animism-align/frontend/app/views/editor/align/align.actions.js @@ -150,7 +150,7 @@ export const spliceTime = start_ts => dispatch => { /* peaks */ export const loadPeaks = (episode) => dispatch => ( - api(dispatch, types.peaks, 'peaks', episode.settings.peaks.url) + episode.settings.peaks ? api(dispatch, types.peaks, 'peaks', episode.settings.peaks.url) : null ) /* longform text */ diff --git a/animism-align/frontend/app/views/editor/media/components/media.form.js b/animism-align/frontend/app/views/editor/media/components/media.form.js index df86516..3a989f1 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.form.js +++ b/animism-align/frontend/app/views/editor/media/components/media.form.js @@ -143,7 +143,7 @@ export default class MediaForm extends Component { } render() { - const { isNew, currentUser } = this.props + const { isNew, currentUser, episode_id } = this.props const { title, submitTitle, errorFields, data } = this.state // console.log(data) return ( @@ -161,6 +161,7 @@ export default class MediaForm extends Component { {data.type === 'image' && <MediaImageForm data={data} + episode_id={episode_id} currentUser={currentUser} onChange={this.handleSelect} onSettingsChange={this.handleSettingsChange} @@ -170,6 +171,7 @@ export default class MediaForm extends Component { {data.type === 'video' && <MediaVideoForm data={data} + episode_id={episode_id} currentUser={currentUser} onChange={this.handleSelect} onSettingsChange={this.handleSettingsChange} @@ -179,6 +181,7 @@ export default class MediaForm extends Component { {data.type === 'file' && <MediaFileForm data={data} + episode_id={episode_id} currentUser={currentUser} onChange={this.handleSelect} onSettingsChange={this.handleSettingsChange} @@ -188,6 +191,7 @@ export default class MediaForm extends Component { {data.type === 'gallery' && <MediaGalleryForm data={data} + episode_id={episode_id} currentUser={currentUser} onChange={this.handleSelect} onSettingsChange={this.handleSettingsChange} diff --git a/animism-align/frontend/app/views/editor/media/components/media.formFile.js b/animism-align/frontend/app/views/editor/media/components/media.formFile.js index bec0a90..fc9c922 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.formFile.js +++ b/animism-align/frontend/app/views/editor/media/components/media.formFile.js @@ -38,6 +38,7 @@ export default class MediaFileForm extends Component { const uploadData = { image: file, tag: "file", + episode_id: this.props.episode_id, username: this.props.currentUser.username, } // uploadData['__image_filename'] = file.filename diff --git a/animism-align/frontend/app/views/editor/media/components/media.formGallery.js b/animism-align/frontend/app/views/editor/media/components/media.formGallery.js index 4003c7d..536b3c6 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.formGallery.js +++ b/animism-align/frontend/app/views/editor/media/components/media.formGallery.js @@ -181,6 +181,7 @@ export default class MediaGalleryForm extends Component { const uploadData = { image, tag, + episode_id: this.props.episode_id, username: this.props.currentUser.username, } if (fn) { diff --git a/animism-align/frontend/app/views/editor/media/components/media.formImage.js b/animism-align/frontend/app/views/editor/media/components/media.formImage.js index 027926b..015a1cb 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.formImage.js +++ b/animism-align/frontend/app/views/editor/media/components/media.formImage.js @@ -103,6 +103,7 @@ export default class MediaImageForm extends Component { const uploadData = { image, tag, + episode_id: this.props.episode_id, username: this.props.currentUser.username, } if (fn) { diff --git a/animism-align/frontend/app/views/editor/media/components/media.formVideo.js b/animism-align/frontend/app/views/editor/media/components/media.formVideo.js index 656ad2f..5a60cc6 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.formVideo.js +++ b/animism-align/frontend/app/views/editor/media/components/media.formVideo.js @@ -60,6 +60,7 @@ export default class MediaVideoForm extends Component { const uploadData = { image: file, tag: "poster", + episode_id: this.props.episode_id, username: this.props.currentUser.username, } // uploadData['__image_filename'] = file.filename diff --git a/animism-align/frontend/app/views/editor/media/containers/media.edit.js b/animism-align/frontend/app/views/editor/media/containers/media.edit.js index 6799494..c7c8e25 100644 --- a/animism-align/frontend/app/views/editor/media/containers/media.edit.js +++ b/animism-align/frontend/app/views/editor/media/containers/media.edit.js @@ -38,6 +38,7 @@ class MediaEdit extends Component { <MediaMenu mediaActions={this.props.mediaActions} /> <MediaForm data={show.res} + episode_id={this.props.episode_id} currentUser={this.props.currentUser} onSubmit={this.handleSubmit.bind(this)} /> diff --git a/animism-align/frontend/app/views/editor/media/containers/media.new.js b/animism-align/frontend/app/views/editor/media/containers/media.new.js index 0a1be55..7c378e0 100644 --- a/animism-align/frontend/app/views/editor/media/containers/media.new.js +++ b/animism-align/frontend/app/views/editor/media/containers/media.new.js @@ -63,6 +63,7 @@ class MediaNew extends Component { <MediaForm isNew data={this.state.initialData} + episode_id={this.props.episode_id} currentUser={this.props.currentUser} onSubmit={this.handleSubmit.bind(this)} /> diff --git a/animism-align/frontend/app/views/editor/media/media.css b/animism-align/frontend/app/views/editor/media/media.css index ebf8c33..eb977fd 100644 --- a/animism-align/frontend/app/views/editor/media/media.css +++ b/animism-align/frontend/app/views/editor/media/media.css @@ -17,7 +17,8 @@ max-width: 100%; } .media .results .img img { - max-width: 295px; + max-width: 150px; + max-height: 150px; } /* new / edit media forms */ |