MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1190-shuffle' into 'develop' 

Fix  #1190: improved shuffle behaviour

Closes #1190

See merge request funkwhale/funkwhale!1202
This commit is contained in:
Agate 2020-08-18 18:10:07 +02:00
parent 191f28f79c cea1c14757
commit d18b02c2d2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/1190.enhancement Normal file
View File

@ -0,0 +1 @@
Improved shuffle behaviour (#1190)

9
front/src/store/queue.js
View File

@ -158,16 +158,15 @@ export default {
// so we replay automatically on next track append // so we replay automatically on next track append
commit('ended', true) commit('ended', true)
}, },
shuffle ({dispatch, commit, state}, callback) { async shuffle ({dispatch, commit, state}, callback) {
let toKeep = state.tracks.slice(0, state.currentIndex + 1) let shuffled = _.shuffle(state.tracks)
let toShuffle = state.tracks.slice(state.currentIndex + 1)
let shuffled = toKeep.concat(_.shuffle(toShuffle))
commit('tracks', []) commit('tracks', [])
let params = {tracks: shuffled} let params = {tracks: shuffled}
if (callback) { if (callback) {
params.callback = callback params.callback = callback
} }
dispatch('appendMany', params) await dispatch('appendMany', params)
await dispatch('currentIndex', 0)
} }
} }
} }