summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli/commands/admin/migrate_to_mysql.py2
-rw-r--r--frontend/app/views/page/components/page.editor.js2
-rw-r--r--frontend/app/views/tile/handles/tile.image.js3
-rw-r--r--frontend/app/views/tile/handles/tile.link.js3
-rw-r--r--frontend/app/views/tile/handles/tile.text.js3
-rw-r--r--frontend/app/views/tile/handles/tile.video.js3
-rw-r--r--frontend/site/viewer/viewer.container.js11
7 files changed, 22 insertions, 5 deletions
diff --git a/cli/commands/admin/migrate_to_mysql.py b/cli/commands/admin/migrate_to_mysql.py
index 60e92eb..9ad0f15 100644
--- a/cli/commands/admin/migrate_to_mysql.py
+++ b/cli/commands/admin/migrate_to_mysql.py
@@ -117,4 +117,4 @@ def make_classes(Base):
created_at = Column(UtcDateTime(), default=utcnow())
updated_at = Column(UtcDateTime(), onupdate=utcnow())
- return [ Graph, Page, Tile, Upload ]
+ return [ Graph, Page, Tile ] #, Upload ]
diff --git a/frontend/app/views/page/components/page.editor.js b/frontend/app/views/page/components/page.editor.js
index ec6ddd3..a3e8513 100644
--- a/frontend/app/views/page/components/page.editor.js
+++ b/frontend/app/views/page/components/page.editor.js
@@ -199,6 +199,7 @@ class PageEditor extends Component {
box={currentTile && tile.id === currentTile.id && currentBox}
onMouseDown={e => this.handleMouseDown(e, tile)}
onDoubleClick={e => this.props.pageActions.showEditTileForm(tile.id)}
+ onMouseEnter={e => {}}
onPlaybackEnded={this.handlePlaybackEnded}
/>
)
@@ -211,6 +212,7 @@ class PageEditor extends Component {
videoBounds={videoBounds}
box={currentTile && temporaryTile.id === currentTile.id && currentBox}
onMouseDown={e => this.handleMouseDown(e, temporaryTile)}
+ onMouseEnter={e => {}}
onPlaybackEnded={this.handlePlaybackEnded}
/>
)}
diff --git a/frontend/app/views/tile/handles/tile.image.js b/frontend/app/views/tile/handles/tile.image.js
index 9ab5616..c4d5e58 100644
--- a/frontend/app/views/tile/handles/tile.image.js
+++ b/frontend/app/views/tile/handles/tile.image.js
@@ -1,7 +1,7 @@
import React from 'react'
import { generateTransform } from 'app/views/tile/tile.utils'
-export default function TileImage({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick }) {
+export default function TileImage({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick, onMouseEnter }) {
// console.log(tile)
const style = {
transform: generateTransform(tile, box, bounds, videoBounds),
@@ -48,6 +48,7 @@ export default function TileImage({ tile, box, bounds, videoBounds, viewing, onM
className={className}
onMouseDown={onMouseDown}
onDoubleClick={onDoubleClick}
+ onMouseEnter={onMouseEnter}
style={style}
>
{content}
diff --git a/frontend/app/views/tile/handles/tile.link.js b/frontend/app/views/tile/handles/tile.link.js
index 4dd4fd4..93db9e1 100644
--- a/frontend/app/views/tile/handles/tile.link.js
+++ b/frontend/app/views/tile/handles/tile.link.js
@@ -1,7 +1,7 @@
import React from 'react'
import { generateTransform, unitsDimension } from 'app/views/tile/tile.utils'
-export default function TileScript({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick }) {
+export default function TileScript({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick, onMouseEnter }) {
// console.log(tile)
const style = {
transform: generateTransform(tile, box, bounds, videoBounds),
@@ -25,6 +25,7 @@ export default function TileScript({ tile, box, bounds, videoBounds, viewing, on
className={className}
onMouseDown={onMouseDown}
onDoubleClick={onDoubleClick}
+ onMouseEnter={onMouseEnter}
style={style}
>
{content}
diff --git a/frontend/app/views/tile/handles/tile.text.js b/frontend/app/views/tile/handles/tile.text.js
index 2fd63b2..97fdfac 100644
--- a/frontend/app/views/tile/handles/tile.text.js
+++ b/frontend/app/views/tile/handles/tile.text.js
@@ -1,7 +1,7 @@
import React from 'react'
import { generateTransform, unitsDimension } from 'app/views/tile/tile.utils'
-export default function TileScript({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick }) {
+export default function TileScript({ tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick, onMouseEnter }) {
// console.log(tile)
const style = {
transform: generateTransform(tile, box, bounds, videoBounds),
@@ -36,6 +36,7 @@ export default function TileScript({ tile, box, bounds, videoBounds, viewing, on
className={className}
onMouseDown={onMouseDown}
onDoubleClick={onDoubleClick}
+ onMouseEnter={onMouseEnter}
style={style}
>
{content}
diff --git a/frontend/app/views/tile/handles/tile.video.js b/frontend/app/views/tile/handles/tile.video.js
index 3166848..e8dbc72 100644
--- a/frontend/app/views/tile/handles/tile.video.js
+++ b/frontend/app/views/tile/handles/tile.video.js
@@ -65,7 +65,7 @@ export default class TileVideo extends Component {
}
render() {
- let { tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick } = this.props
+ let { tile, box, bounds, videoBounds, viewing, onMouseDown, onDoubleClick, onMouseEnter } = this.props
// console.log(tile)
const style = {
transform: generateTransform(tile, box, bounds, videoBounds),
@@ -90,6 +90,7 @@ export default class TileVideo extends Component {
className={className}
onMouseDown={onMouseDown}
onDoubleClick={onDoubleClick}
+ onMouseEnter={onMouseEnter}
style={style}
>
<video
diff --git a/frontend/site/viewer/viewer.container.js b/frontend/site/viewer/viewer.container.js
index 9bf4442..fbcd9f8 100644
--- a/frontend/site/viewer/viewer.container.js
+++ b/frontend/site/viewer/viewer.container.js
@@ -126,6 +126,16 @@ class ViewerContainer extends Component {
}
}
+ handleMouseEnter(tile) {
+ if (tile.settings.audio_on_hover_id > 0) {
+ this.props.audio.player.playTile({
+ type: "hover",
+ tile,
+ restart: true,
+ })
+ }
+ }
+
handlePlaybackEnded(tile) {
if (tile.href && tile.settings.autoadvance) {
history.push(tile.href)
@@ -173,6 +183,7 @@ class ViewerContainer extends Component {
onMouseDown={e => this.handleMouseDown(e, tile)}
onPlaybackEnded={e => this.handlePlaybackEnded(e, tile)}
onDoubleClick={e => {}}
+ onMouseEnter={e => this.handleMouseEnter(e, tile)}
/>
)
})}