charles texts

1 files changed, 13 insertions, 14 deletions

diff --git a/frontend/site/viewer/viewer.container.js b/frontend/site/viewer/viewer.container.js
index d8279e8..10ce093 100644
--- a/frontend/site/viewer/viewer.container.js
+++ b/frontend/site/viewer/viewer.container.js
@@ -16,7 +16,6 @@ class ViewerContainer extends Component {
     bounds: { width: window.innerWidth, height: window.innerHeight },
     roadblock: false,
     unloaded: false,
-    popups: {},
     hidden: {},
     time: 0,
     maxDeferTime: 0,
@@ -74,9 +73,11 @@ class ViewerContainer extends Component {
     // console.log(pages, page)
     // console.log("show page", page.id)
     if (!this.props.interactive && hasAutoplay(page)) {
-      this.setState({ page, popups: {}, hidden: {}, roadblock: true, unloaded: false })
+      this.setState({ page, hidden: {}, roadblock: true, unloaded: false })
+      actions.site.setPopups({})
     } else {
-      this.setState({ page, popups: {}, hidden: {}, roadblock: false, unloaded: false })
+      this.setState({ page, hidden: {}, roadblock: false, unloaded: false })
+      actions.site.setPopups({})
       actions.site.interact()
       this.props.audio.player.playPage(page)
       this.resetTimer(page)
@@ -116,19 +117,15 @@ class ViewerContainer extends Component {
         return
       }
       else if (tile.href === '__open_popup') {
-        this.setState({
-          popups: {
-            ...this.state.popups,
-            [tile.settings.target_popup]: true,
-          },
+        actions.site.setPopups({
+          ...this.props.popups,
+          [tile.settings.target_popup]: true,
         })
       }
       else if (tile.href === '__close_popup') {
-        this.setState({
-          popups: {
-            ...this.state.popups,
-            [tile.settings.target_popup]: false,
-          },
+        actions.site.setPopups({
+          ...this.props.popups,
+          [tile.settings.target_popup]: false,
         })
       }
       else if (!tile.settings.navigate_when_audio_finishes) {
@@ -168,7 +165,8 @@ class ViewerContainer extends Component {
   }
 
   render() {
-    const { page, audio, popups, hidden, time } = this.state
+    const { page, audio, hidden, time } = this.state
+    const { popups } = this.props
     if (this.state.unloaded) {
       return null
     }
@@ -251,6 +249,7 @@ const mapStateToProps = state => ({
   audio: state.audio,
   graph: state.site.graph,
   cursors: state.site.cursors,
+  popups: state.site.popups,
   interactive: state.site.interactive,
 })