mute button for video too

3 files changed, 6 insertions, 4 deletions

diff --git a/frontend/app/views/page/components/page.editor.js b/frontend/app/views/page/components/page.editor.js
index 658da2d..a64edb2 100644
--- a/frontend/app/views/page/components/page.editor.js
+++ b/frontend/app/views/page/components/page.editor.js
@@ -207,6 +207,7 @@ class PageEditor extends Component {
               videoBounds={videoBounds}
               cursors={this.state.cursors}
               box={currentTile && tile.id === currentTile.id && currentBox}
+              audio={{}}
               onMouseDown={e => this.handleMouseDown(e, tile)}
               onDoubleClick={e => this.props.pageActions.showEditTileForm(tile.id)}
               onMouseEnter={e => {}}
@@ -222,6 +223,7 @@ class PageEditor extends Component {
             bounds={this.state.bounds}
             videoBounds={videoBounds}
             cursors={this.state.cursors}
+            audio={{}}
             box={currentTile && temporaryTile.id === currentTile.id && currentBox}
             onMouseDown={e => this.handleMouseDown(e, temporaryTile)}
             onMouseEnter={e => {}}
diff --git a/frontend/app/views/tile/handles/tile.video.js b/frontend/app/views/tile/handles/tile.video.js
index ca9286a..74e08f8 100644
--- a/frontend/app/views/tile/handles/tile.video.js
+++ b/frontend/app/views/tile/handles/tile.video.js
@@ -72,7 +72,7 @@ export default class TileVideo extends Component {
   }
 
   render() {
-    let { tile, box, bounds, videoBounds, cursors, viewing, onMouseDown, onDoubleClick, onMouseEnter, onMouseLeave } = this.props
+    let { tile, box, bounds, audio, videoBounds, cursors, viewing, onMouseDown, onDoubleClick, onMouseEnter, onMouseLeave } = this.props
 
     if (!tile.settings.url) {
       return null
@@ -98,7 +98,7 @@ export default class TileVideo extends Component {
     // console.log(tile.settings)
     className += ' ' + tile.settings.align
     const muted = viewing
-      ? tile.settings.muted
+      ? (tile.settings.muted || audio.muted)
       : true
     return (
       <div
diff --git a/frontend/site/viewer/viewer.container.js b/frontend/site/viewer/viewer.container.js
index 1add4cf..3138a5a 100644
--- a/frontend/site/viewer/viewer.container.js
+++ b/frontend/site/viewer/viewer.container.js
@@ -192,8 +192,8 @@ class ViewerContainer extends Component {
   }
 
   render() {
-    const { page, audio, hidden, time } = this.state
-    const { popups } = this.props
+    const { page, hidden, time } = this.state
+    const { popups, audio } = this.props
     if (this.state.unloaded) {
       return null
     }