Merge branch 'sshuffle-restart' into 'develop'

Front: Shuffle now restart next track from beginning (#70)

Closes #70

See merge request funkwhale/funkwhale!52
merge-requests/154/head
Eliot Berriot 2018-02-24 17:06:07 +00:00
commit d33ee8e193
3 zmienionych plików z 3 dodań i 0 usunięć

Wyświetl plik

@ -5,6 +5,7 @@ Changelog
----------------
- Front: Fixed broken ajax call on radio builder (#69)
- Front: Shuffle now restart next track from beginning (#70)
- Front: volume slider should now have the same style everywhere (#72)
0.5 (2018-02-24)

Wyświetl plik

@ -142,6 +142,7 @@ export default {
},
shuffle ({dispatch, commit, state}) {
let shuffled = _.shuffle(state.tracks)
commit('player/currentTime', 0, {root: true})
commit('tracks', [])
dispatch('appendMany', {tracks: shuffled})
}

Wyświetl plik

@ -322,6 +322,7 @@ describe('store/queue', () => {
action: store.actions.shuffle,
params: {state: {tracks: tracks}},
expectedMutations: [
{ type: 'player/currentTime', payload: 0 , options: {root: true}},
{ type: 'tracks', payload: [] }
],
expectedActions: [