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

Merge branch 'fix-shuffle-loading' into 'develop' 

fix shuffle loading too big

See merge request funkwhale/funkwhale!322
This commit is contained in:
Eliot Berriot 2018-07-13 12:57:38 +00:00
parent 2e9fd9c3c7 f3f4f709dc
commit 309eb845e1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@
:title="labels.shuffle" :title="labels.shuffle"
v-if="!showVolume" v-if="!showVolume"
class="two wide column control"> class="two wide column control">
<div v-if="isShuffling" class="ui inline shuffling inverted small active loader"></div> <div v-if="isShuffling" class="ui inline shuffling inverted tiny active loader"></div>
<i v-else @click="shuffle()" :class="['ui', 'random', 'secondary', {'disabled': queue.tracks.length === 0}, 'icon']" ></i> <i v-else @click="shuffle()" :class="['ui', 'random', 'secondary', {'disabled': queue.tracks.length === 0}, 'icon']" ></i>
</div> </div>
<div class="one wide column" v-if="!showVolume"></div> <div class="one wide column" v-if="!showVolume"></div>
@ -195,7 +195,8 @@ export default {
updateProgress: 'player/updateProgress' updateProgress: 'player/updateProgress'
}), }),
shuffle () { shuffle () {
if (this.isShuffling) { let disabled = this.queue.tracks.length === 0
if (this.isShuffling || disabled) {
return return
} }
let self = this let self = this