From 151ca26315c84ec484e2fec5b9dfb92e5703aa1f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 11 Mar 2021 16:45:02 +0100 Subject: fix loading --- animism-align/frontend/app/views/audio/audio.actions.js | 14 ++++++++------ .../frontend/app/views/editor/align/align.actions.js | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/animism-align/frontend/app/views/audio/audio.actions.js b/animism-align/frontend/app/views/audio/audio.actions.js index 4627e90..cd241a1 100644 --- a/animism-align/frontend/app/views/audio/audio.actions.js +++ b/animism-align/frontend/app/views/audio/audio.actions.js @@ -16,8 +16,8 @@ audioPlayer.addEventListener('timeupdate', () => { dispatch({ type: types.audio.update_time, play_ts: audioPlayer.currentTime }) }) -export const load = (url) => dispatch => { - return new Promise((resolve, reject) => { +export const load = (url) => dispatch => ( + new Promise((resolve, reject) => { audioPlayer.addEventListener('loadedmetadata', () => { // console.log('audio duration:', audioPlayer.duration) dispatch({ type: types.align.set_display_setting, key: 'duration', value: audioPlayer.duration }) @@ -25,10 +25,12 @@ export const load = (url) => dispatch => { }) audioPlayer.src = url }) -} -export const loadEpisodeAudio = (episode) => dispatch => { - return episode.settings.audio ? load(episode.settings.audio.url)(dispatch) : null -} +) +export const loadEpisodeAudio = (episode) => dispatch => ( + episode.settings.audio + ? load(episode.settings.audio.url)(dispatch) + : new Promise((resolve) => resolve(true)) +) export const play = () => dispatch => { dispatch({ type: types.audio.play }) 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 fe5020c..62f058a 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,9 @@ export const spliceTime = start_ts => dispatch => { /* peaks */ export const loadPeaks = (episode) => dispatch => ( - episode.settings.peaks ? api(dispatch, types.peaks, 'peaks', episode.settings.peaks.url) : null + episode.settings.peaks + ? api(dispatch, types.peaks, 'peaks', episode.settings.peaks.url) + : new Promise((resolve) => resolve(true)) ) /* longform text */ -- cgit v1.2.3-70-g09d2