From 6b8dc1b53c06f41b9a5753db7edd41800847c768 Mon Sep 17 00:00:00 2001
From: Bat <baptiste@gelez.xyz>
Date: Sat, 31 Mar 2018 14:14:58 +0100
Subject: [PATCH] Reset player position before playing previous track
---
front/src/components/audio/Player.vue | 6 ++----
front/src/components/audio/Track.vue | 10 +++++++++-
front/src/store/queue.js | 9 ++++-----
front/test/unit/specs/store/queue.spec.js | 8 --------
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 75a01c52e0..2b0032cf70 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -58,9 +58,8 @@
<div class="two wide column controls ui grid">
<div
title="Previous track"
- class="two wide column control"
- :disabled="!hasPrevious">
- <i @click="previous" :class="['ui', {'disabled': !hasPrevious}, 'step', 'backward', 'big', 'icon']" ></i>
+ class="two wide column control">
+ <i @click="previous" class="ui step backward big icon"></i>
</div>
<div
v-if="!playing"
@@ -205,7 +204,6 @@ export default {
...mapGetters({
currentTrack: 'queue/currentTrack',
hasNext: 'queue/hasNext',
- hasPrevious: 'queue/hasPrevious',
durationFormatted: 'player/durationFormatted',
currentTimeFormatted: 'player/currentTimeFormatted',
progress: 'player/progress'
diff --git a/front/src/components/audio/Track.vue b/front/src/components/audio/Track.vue
index 370d8ae2d3..68dd344598 100644
--- a/front/src/components/audio/Track.vue
+++ b/front/src/components/audio/Track.vue
@@ -31,7 +31,8 @@ export default {
},
data () {
return {
- sourceErrors: 0
+ sourceErrors: 0,
+ isUpdatingTime: false
}
},
computed: {
@@ -99,6 +100,7 @@ export default {
}
},
updateProgress: _.throttle(function () {
+ this.isUpdatingTime = true
if (this.$refs.audio) {
this.$store.dispatch('player/updateProgress', this.$refs.audio.currentTime)
}
@@ -130,6 +132,12 @@ export default {
},
volume: function (newValue) {
this.$refs.audio.volume = newValue
+ },
+ currentTime (newValue) {
+ if (!this.isUpdatingTime) {
+ this.setCurrentTime(newValue)
+ }
+ this.isUpdatingTime = false
}
}
}
diff --git a/front/src/store/queue.js b/front/src/store/queue.js
index a864405cf6..0908f180c9 100644
--- a/front/src/store/queue.js
+++ b/front/src/store/queue.js
@@ -48,9 +48,6 @@ export default {
},
hasNext: state => {
return state.currentIndex < state.tracks.length - 1
- },
- hasPrevious: state => {
- return state.currentIndex > 0
}
},
actions: {
@@ -103,9 +100,11 @@ export default {
dispatch('next')
}
},
- previous ({state, dispatch}) {
- if (state.currentIndex > 0) {
+ previous ({state, dispatch, rootState}) {
+ if (state.currentIndex > 0 && rootState.player.currentTime < 3) {
dispatch('currentIndex', state.currentIndex - 1)
+ } else {
+ dispatch('currentIndex', state.currentIndex)
}
},
next ({state, dispatch, commit, rootState}) {
diff --git a/front/test/unit/specs/store/queue.spec.js b/front/test/unit/specs/store/queue.spec.js
index b445229ec4..a46ca35bfd 100644
--- a/front/test/unit/specs/store/queue.spec.js
+++ b/front/test/unit/specs/store/queue.spec.js
@@ -81,14 +81,6 @@ describe('store/queue', () => {
const state = { tracks: [1, 2, 3], currentIndex: 2 }
expect(store.getters['hasNext'](state)).to.equal(false)
})
- it('hasPrevious true', () => {
- const state = { currentIndex: 1 }
- expect(store.getters['hasPrevious'](state)).to.equal(true)
- })
- it('hasPrevious false', () => {
- const state = { currentIndex: 0 }
- expect(store.getters['hasPrevious'](state)).to.equal(false)
- })
})
describe('actions', () => {
it('append at end', (done) => {
--
GitLab