Commit 9124c7a9 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '150-player-queue-tab' into 'develop'

Resolve "Include player buttons on the queue tab"

Closes #150

See merge request funkwhale/funkwhale!160
parents 0ab62b86 1a34f448
Player is back in Queue tab (#150)
......@@ -49,8 +49,6 @@
class="item" v-if="$store.state.auth.availablePermissions['federation.manage']"
:to="{path: '/manage/federation/libraries'}"><i class="sitemap icon"></i> {{ $t('Federation') }}</router-link>
</div>
<player></player>
</div>
<div v-if="queue.previousQueue " class="ui black icon message">
<i class="history icon"></i>
......@@ -90,7 +88,6 @@
</draggable>
</table>
<div v-if="$store.state.radios.running" class="ui black message">
<div class="content">
<div class="header">
<i class="feed icon"></i> {{ $t('You have a radio playing') }}
......@@ -101,6 +98,7 @@
</div>
</div>
</div>
<player @next="scrollToCurrent" @previous="scrollToCurrent"></player>
</div>
</template>
......
......@@ -173,11 +173,21 @@ export default {
...mapActions({
togglePlay: 'player/togglePlay',
clean: 'queue/clean',
next: 'queue/next',
previous: 'queue/previous',
shuffle: 'queue/shuffle',
updateProgress: 'player/updateProgress'
}),
next () {
let self = this
this.$store.dispatch('queue/next').then(() => {
self.$emit('next')
})
},
previous () {
let self = this
this.$store.dispatch('queue/previous').then(() => {
self.$emit('previous')
})
},
touchProgress (e) {
let time
let target = this.$refs.progress
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment