diff options
| -rw-r--r-- | frontend/app/views/page/components/page.editor.js | 3 | ||||
| -rw-r--r-- | frontend/app/views/tile/components/tile.form.js | 11 | ||||
| -rw-r--r-- | frontend/app/views/tile/handles/tile.video.js | 15 | ||||
| -rw-r--r-- | frontend/site/app.js | 10 | ||||
| -rw-r--r-- | frontend/site/audio/audio.player.js | 4 | ||||
| -rw-r--r-- | frontend/site/site/site.actions.js | 4 |
6 files changed, 36 insertions, 11 deletions
diff --git a/frontend/app/views/page/components/page.editor.js b/frontend/app/views/page/components/page.editor.js index adf8652..ec6ddd3 100644 --- a/frontend/app/views/page/components/page.editor.js +++ b/frontend/app/views/page/components/page.editor.js @@ -138,7 +138,7 @@ class PageEditor extends Component { const { dx, dy } = box let url = window.location.pathname this.setState({ - page: null, + tile: null, box: null, initialBox: null, dragging: false, @@ -150,6 +150,7 @@ class PageEditor extends Component { } const updatedTile = { ...tile, + target_page_id: tile.target_page_id || 0, settings: { ...tile.settings, x: tile.settings.x + dx, diff --git a/frontend/app/views/tile/components/tile.form.js b/frontend/app/views/tile/components/tile.form.js index c2a8f79..8f6fe83 100644 --- a/frontend/app/views/tile/components/tile.form.js +++ b/frontend/app/views/tile/components/tile.form.js @@ -601,6 +601,17 @@ class TileForm extends Component { onChange={this.handleSettingsSelect} /> </div> + {!temporaryTile.settings.muted && ( + <Slider + title='Volume' + name='volume' + value={('volume' in temporaryTile.settings) ? temporaryTile.settings.volume : 1.0} + onChange={this.handleSettingsSelect} + min={0.0} + max={1.0} + step={0.01} + /> + )} {temporaryTile.settings.loop && ( <div className='row'> <Checkbox diff --git a/frontend/app/views/tile/handles/tile.video.js b/frontend/app/views/tile/handles/tile.video.js index a34d348..b4183ce 100644 --- a/frontend/app/views/tile/handles/tile.video.js +++ b/frontend/app/views/tile/handles/tile.video.js @@ -29,6 +29,15 @@ export default class TileVideo extends Component { this.el = this.videoRef.current this.el.addEventListener('ended', this.handleEnded) this.el.addEventListener('timeupdate', this.handleTimeUpdate) + const muted = this.props.viewing + ? this.props.tile.settings.muted + : true + const volume = muted + ? 0.0 + : ('volume' in this.props.tile.settings) + ? this.props.tile.settings.volume + : 1.0 + this.el.volume = volume } unbind() { @@ -71,6 +80,9 @@ export default class TileVideo extends Component { return null } className += ' ' + tile.settings.align + const muted = viewing + ? tile.settings.muted + : true return ( <div className={className} @@ -83,8 +95,9 @@ export default class TileVideo extends Component { src={tile.settings.url} autoPlay={true} controls={false} + disablePictureInPicture={true} loop={tile.settings.loop} - muted={viewing ? tile.settings.muted : true} + muted={muted} style={generateVideoStyle(tile, bounds)} /> </div> diff --git a/frontend/site/app.js b/frontend/site/app.js index 4bb352b..098bd44 100644 --- a/frontend/site/app.js +++ b/frontend/site/app.js @@ -9,12 +9,12 @@ export default class App extends Component { componentDidMount() { const path_partz = window.location.pathname.split('/') const graph_name = path_partz[1] - let path_name = null - if (path_partz.length > 2) { - path_name = path_partz[2] - } + // let path_name = null + // if (path_partz.length > 2) { + // path_name = path_partz[2] + // } // console.log('loading', graph_name, path_name) - actions.site.loadSite(graph_name, path_name) + actions.site.loadSite(graph_name) } render() { diff --git a/frontend/site/audio/audio.player.js b/frontend/site/audio/audio.player.js index 0dacdce..9914cd6 100644 --- a/frontend/site/audio/audio.player.js +++ b/frontend/site/audio/audio.player.js @@ -26,13 +26,13 @@ export default class AudioPlayer { } done(id) { - console.log('remove', id) + // console.log('remove', id) delete this.players[id] } playPage(page) { const { background_audio_id, restart_audio } = page.settings - console.log('playPage', page) + // console.log('playPage', page) if ( this.current_background_id && this.current_background_id !== background_audio_id diff --git a/frontend/site/site/site.actions.js b/frontend/site/site/site.actions.js index 07814d6..aab68e8 100644 --- a/frontend/site/site/site.actions.js +++ b/frontend/site/site/site.actions.js @@ -6,8 +6,8 @@ export const setSiteTitle = title => dispatch => { dispatch({ type: types.site.set_site_title, payload: title }) } -export const loadSite = (graph_name, path_name) => dispatch => ( - api(dispatch, types.site, 'site', '/' + graph_name + '/index.json') +export const loadSite = graph_name => dispatch => ( + api(dispatch, types.site, 'site', '/' + graph_name + '/index.json?t=' + (Date.now() / 3600000)) ) export const interact = () => dispatch => { |