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

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
This commit is contained in:
Eliot Berriot 2018-09-07 09:52:21 +00:00
parent 07830506a8 c8a2531580
commit 9af8a68b4d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/changelog.d/464.bugfix Normal file
View File

@ -0,0 +1,2 @@
Do not restart current song when rordering queue, deleting tracks from queue or
adding tracks to queue (#464)

4
front/src/components/audio/Player.vue
View File

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

2
front/src/components/audio/album/Widget.vue
View File

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