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

Merge branch 'currenttrack-null' into 'master' 

Front-end minor fixes / error handling

See merge request funkwhale/funkwhale!816
This commit is contained in:
Eliot Berriot 2019-07-02 16:28:17 +02:00
parent 78ab153734 7a6ba83d03
commit 5e18333135
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,11 @@ export default {
return return
} }
let image = this.$refs.cover let image = this.$refs.cover
this.ambiantColors = ColorThief.prototype.getPalette(image, 4).slice(0, 4) try {
this.ambiantColors = ColorThief.prototype.getPalette(image, 4).slice(0, 4)
} catch (e) {
console.log('Cannot generate player background from cover image, likely a cross-origin tainted canvas issue')
}
}, },
handleError({ sound, error }) { handleError({ sound, error }) {
this.$store.commit("player/isLoadingAudio", false) this.$store.commit("player/isLoadingAudio", false)

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

@ -20,7 +20,7 @@
<tbody> <tbody>
<tr v-for="track in tracks"> <tr v-for="track in tracks">
<td class="play-cell"> <td class="play-cell">
<play-button :class="['basic', {orange: isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :track="track"></play-button> <play-button :class="['basic', {orange: currentTrack && isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :track="track"></play-button>
</td> </td>
<td class="content-cell" colspan="5"> <td class="content-cell" colspan="5">
<track-favorite-icon :track="track"></track-favorite-icon> <track-favorite-icon :track="track"></track-favorite-icon>

2
front/src/components/audio/track/Row.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<tr> <tr>
<td> <td>
<play-button :class="['basic', {orange: isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :is-playable="playable" :track="track"></play-button> <play-button :class="['basic', {orange: currentTrack && isPlaying && track.id === currentTrack.id}, 'icon']" :discrete="true" :is-playable="playable" :track="track"></play-button>
</td> </td>
<td> <td>
<img class="ui mini image" v-if="track.album.cover.original" v-lazy="$store.getters['instance/absoluteUrl'](track.album.cover.small_square_crop)"> <img class="ui mini image" v-if="track.album.cover.original" v-lazy="$store.getters['instance/absoluteUrl'](track.album.cover.small_square_crop)">