diff options
Diffstat (limited to 'animism-align/frontend/app/views')
9 files changed, 14 insertions, 6 deletions
diff --git a/animism-align/frontend/app/views/align/align.reducer.js b/animism-align/frontend/app/views/align/align.reducer.js index dec27a4..8a660c0 100644 --- a/animism-align/frontend/app/views/align/align.reducer.js +++ b/animism-align/frontend/app/views/align/align.reducer.js @@ -1,5 +1,5 @@ import * as types from 'app/types' -import { session, getDefault, getDefaultInt } from 'app/session' +// import { session, getDefault, getDefaultInt } from 'app/session' const initialState = { timeline: { diff --git a/animism-align/frontend/app/views/audio/audio.actions.js b/animism-align/frontend/app/views/audio/audio.actions.js index b5d4e1b..ef5a4f6 100644 --- a/animism-align/frontend/app/views/audio/audio.actions.js +++ b/animism-align/frontend/app/views/audio/audio.actions.js @@ -34,12 +34,14 @@ export const pause = () => dispatch => { audioPlayer.pause() } export const seek = play_ts => dispatch => { + console.log('seek to', play_ts) audioPlayer.currentTime = play_ts - dispatch({ type: types.audio.seek, seek_ts: audioPlayer.currentTime }) + console.log(play_ts, audioPlayer.currentTime) + dispatch({ type: types.audio.seek, seek_ts: audioPlayer.currentTime || play_ts }) } export const jump = delta_ts => dispatch => { audioPlayer.currentTime += delta_ts - dispatch({ type: types.audio.seek, seek_ts: audioPlayer.currentTime }) + dispatch({ type: types.audio.seek, seek_ts: audioPlayer.currentTime || play_ts }) } export const toggle = () => dispatch => { if (store.getState().audio.playing) { diff --git a/animism-align/frontend/app/views/paragraph/components/paragraph.list.js b/animism-align/frontend/app/views/paragraph/components/paragraph.list.js index a8f32b3..1507b51 100644 --- a/animism-align/frontend/app/views/paragraph/components/paragraph.list.js +++ b/animism-align/frontend/app/views/paragraph/components/paragraph.list.js @@ -14,6 +14,7 @@ class ParagraphList extends Component { componentDidUpdate(prevProps) { if (this.props.audio.play_ts === prevProps.audio.play_ts) return + if (!this.props.paragraphs) return this.setCurrentParagraph() } @@ -64,6 +65,7 @@ class ParagraphList extends Component { onAnnotationClick, onParagraphDoubleClick, } = this.props const { currentParagraph, currentAnnotation } = this.state + if (!paragraphs) return null return paragraphs.map((paragraph, i) => { if (selectedParagraph && selectedParagraph.id === paragraph.id) { paragraph = selectedParagraph diff --git a/animism-align/frontend/app/views/paragraph/paragraph.reducer.js b/animism-align/frontend/app/views/paragraph/paragraph.reducer.js index 041014f..3b33128 100644 --- a/animism-align/frontend/app/views/paragraph/paragraph.reducer.js +++ b/animism-align/frontend/app/views/paragraph/paragraph.reducer.js @@ -1,5 +1,5 @@ import * as types from 'app/types' -import { session, getDefault, getDefaultInt } from 'app/session' +// import { session, getDefault, getDefaultInt } from 'app/session' import { crudState, crudReducer } from 'app/api/crud.reducer' diff --git a/animism-align/frontend/app/views/viewer/nav/nav.parent.js b/animism-align/frontend/app/views/viewer/nav/nav.parent.js index d18aac0..cb83f94 100644 --- a/animism-align/frontend/app/views/viewer/nav/nav.parent.js +++ b/animism-align/frontend/app/views/viewer/nav/nav.parent.js @@ -61,7 +61,7 @@ class NavParent extends Component { e && e.preventDefault() e && e.stopPropagation() const { viewer } = this.props - // console.log('>> SEEK') + console.log('>> SEEK', viewer.nextSection) if (viewer.nextSection) { actions.viewer.seekToSection(viewer.nextSection) } else { diff --git a/animism-align/frontend/app/views/viewer/player/player.container.js b/animism-align/frontend/app/views/viewer/player/player.container.js index 26697f9..0bf64d1 100644 --- a/animism-align/frontend/app/views/viewer/player/player.container.js +++ b/animism-align/frontend/app/views/viewer/player/player.container.js @@ -83,6 +83,7 @@ class PlayerContainer extends Component { // console.log('inCurrentSection?', inCurrentSection) // console.log('didSeek?', didSeek) // if the current TS isn't in the same section as the current one... + console.log(currentSection.start_ts, play_ts, currentSection.end_ts) if (inCurrentSection) { return } diff --git a/animism-align/frontend/app/views/viewer/player/player.transcript.js b/animism-align/frontend/app/views/viewer/player/player.transcript.js index 15d376a..9796008 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.js +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.js @@ -60,6 +60,7 @@ class PlayerTranscript extends Component { const className = "player-transcript " + color + " " + ( inlineParagraphCount > 2 ? 'scrollable' : 'not-scrollable' ) + console.log(this.props.section) return ( <div className={className} diff --git a/animism-align/frontend/app/views/viewer/viewer.actions.js b/animism-align/frontend/app/views/viewer/viewer.actions.js index 82d3cf1..1372013 100644 --- a/animism-align/frontend/app/views/viewer/viewer.actions.js +++ b/animism-align/frontend/app/views/viewer/viewer.actions.js @@ -47,6 +47,8 @@ export const loadSections = () => dispatch => { const { order: annotationOrder, lookup: annotationLookup } = state.annotation.index const { lookup: mediaLookup } = state.media.index + console.log(state) + // loop over the annotations in time order. annotationOrder.forEach((annotation_id, i) => { // fetch the current annotation @@ -206,7 +208,6 @@ export const loadSections = () => dispatch => { }) // console.log(sections) // console.log(footnoteList) - // console.log(fullscreenTimeline) dispatch({ type: types.viewer.load_sections, sections, footnoteList }) } diff --git a/animism-align/frontend/app/views/viewer/viewer.container.js b/animism-align/frontend/app/views/viewer/viewer.container.js index 90787db..c81b79e 100644 --- a/animism-align/frontend/app/views/viewer/viewer.container.js +++ b/animism-align/frontend/app/views/viewer/viewer.container.js @@ -35,6 +35,7 @@ import VitrineModal from './modals/modals.vitrine' class ViewerContainer extends Component { render() { const { loaded, viewer, playing } = this.props + // console.log(loaded, playing, viewer) if (!loaded) { return <div className='viewer loading'><Loader /></div> } |