From 1a34f44898036aabf48c9a68ce457f17d6fddc30 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 23 Apr 2018 19:05:48 +0200
Subject: [PATCH] Fix #150: Player is back in Queue tab
---
changes/changelog.d/150.enhancement | 1 +
front/src/components/Sidebar.vue | 4 +---
front/src/components/audio/Player.vue | 14 ++++++++++++--
3 files changed, 14 insertions(+), 5 deletions(-)
create mode 100644 changes/changelog.d/150.enhancement
diff --git a/changes/changelog.d/150.enhancement b/changes/changelog.d/150.enhancement
new file mode 100644
index 00000000..419b0a4b
--- /dev/null
+++ b/changes/changelog.d/150.enhancement
@@ -0,0 +1 @@
+Player is back in Queue tab (#150)
diff --git a/front/src/components/Sidebar.vue b/front/src/components/Sidebar.vue
index 3f793fe0..51e34057 100644
--- a/front/src/components/Sidebar.vue
+++ b/front/src/components/Sidebar.vue
@@ -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>
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index ad90a599..f27ff3ed 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -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
--
GitLab