Skip to content
Snippets Groups Projects
Commit 9af8a68b authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '464-restart-current-song' into 'develop'

Resolve "Clicking on Play Next or add to queue restarts current song"

Closes #464

See merge request funkwhale/funkwhale!400
parents 07830506 c8a25315
No related branches found
No related tags found
No related merge requests found
Do not restart current song when rordering queue, deleting tracks from queue or
adding tracks to queue (#464)
......@@ -317,8 +317,8 @@ export default {
}
},
watch: {
currentTrack (newValue) {
if (!this.isShuffling) {
currentTrack (newValue, oldValue) {
if (!this.isShuffling && newValue != oldValue) {
this.audioKey = String(new Date())
}
if (!newValue || !newValue.album.cover) {
......
......@@ -30,7 +30,7 @@
</div>
<div class="extra content">
<human-date class="left floated" :date="album.creation_date"></human-date>
<play-button class="right floated basic icon" :dropdown-only="true" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large', 'grey']" :album="album.id"></play-button>
<play-button class="right floated basic icon" :dropdown-only="true" :is-playable="album.is_playable" :dropdown-icon-classes="['ellipsis', 'horizontal', 'large', 'grey']" :album="album.id"></play-button>
</div>
</div>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment