mirror
/
funkwhale
kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix #1190: improved shuffle behaviour

environments/review-docs-devel-1399dq/deployments/6607
Agate 2020-08-18 18:03:34 +02:00
rodzic 191f28f79c
commit cea1c14757
2 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
changes/changelog.d/1190.enhancement 100644
Wyświetl plik

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

9
front/src/store/queue.js
Wyświetl plik

@ -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)
} }
} }
} }