diff --git a/package.json b/package.json index 81895c5da..fac9fdaf4 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "howler": "^2.0.2", "iframe-resizer": "^3.5.7", "lodash": "^4.17.3", + "object-hash": "^1.1.5", "query-string": "^4.3.1", "react": "15.3.0", "react-dom": "15.3.0", diff --git a/src/app.js b/src/app.js index 30990165c..54e46399a 100644 --- a/src/app.js +++ b/src/app.js @@ -1,40 +1,20 @@ import Vue from 'vue' import head from 'lodash/head' -import { timeToSeconds } from 'utils/time' import registerDirectives from './directives' registerDirectives(Vue) // Store import store from 'store' -import * as effects from './effects' - -// Media Driver -import mediaPlayer from './media-player' // UI Components import App from './components/App.vue' - export default config => { // Initialize meta for store store.dispatch(store.actions.init(config)) - const media = mediaPlayer(config.audio, { - playtime: timeToSeconds(config.playtime), - setPlaytime: playtime => store.dispatch(store.actions.setPlaytime(playtime)), - setBufferState: buffer => store.dispatch(store.actions.setBuffer(buffer)), - setDuration: duration => store.dispatch(store.actions.setDuration(duration)), - onPlay: () => store.dispatch(store.actions.playEvent()), - onPause: () => store.dispatch(store.actions.pauseEvent()), - onStop: () => store.dispatch(store.actions.stopEvent()), - onLoad: () => store.dispatch(store.actions.loading()) - }) - - effects.registerMediaEffects(media) - effects.registerIdleEffects() - window.PODLOVE_STORE = store return new Vue({ diff --git a/src/components/App.vue b/src/components/App.vue index 21969f0d2..f40708c00 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -45,7 +45,7 @@ @import 'font'; @import 'share'; - @import 'marquee'; + @import 'utils'; .podlove { display: block; diff --git a/src/components/player/ProgressBar.vue b/src/components/player/ProgressBar.vue index c2b5df018..e13bf58b1 100644 --- a/src/components/player/ProgressBar.vue +++ b/src/components/player/ProgressBar.vue @@ -20,7 +20,7 @@ import store from 'store' import color from 'color' - import ChaptersIndicator from './chapters/Indicator.vue' + import ChaptersIndicator from './chapters/ChapterIndicator.vue' const interpolate = (num = 0) => Math.round(num * 100) / 100 diff --git a/src/components/player/Timer.vue b/src/components/player/Timer.vue index 78fcfac2a..de4d491c0 100644 --- a/src/components/player/Timer.vue +++ b/src/components/player/Timer.vue @@ -12,7 +12,7 @@