Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-07-05 16:04:39 +02:00
commit b95710bb3a
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
12 changed files with 99 additions and 10 deletions

View file

@ -364,7 +364,11 @@ export default {
return
}
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 }) {
this.$store.commit("player/isLoadingAudio", false)