mcg/mlpcardgame
2
0
Fork 0
Code Issues 23 Pull requests 1 Releases Wiki Activity

Various bugfixes #40

Merged
hamcha merged 3 commits from bugfix/various into master 2019-09-21 08:54:21 +00:00
Conversation 0 Commits 3 Files changed 2 +12 -2
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f72bab2143 - Show all commits

12
src/components/Cards/CardImage.vue
View file

@ -17,16 +17,23 @@ export default class CardImage extends Vue {
private loaded!: boolean; private loaded!: boolean;
private loadedURL!: string; private loadedURL!: string;
private loadedTimeout!: boolean;
private data() { private data() {
return { return {
loaded: false, loaded: false,
loadedURL: "" loadedURL: "",
loadedTimeout: false
}; };
} }
private mounted() { private mounted() {
this.fetchImage(); this.fetchImage();
setTimeout(() => {
if (!this.loaded) {
this.loadedTimeout = true;
}
}, 100);
this.$watch("id", () => { this.$watch("id", () => {
this.loaded = false; this.loaded = false;
this.fetchImage(); this.fetchImage();
@ -43,7 +50,10 @@ export default class CardImage extends Vue {
if (this.loaded) { if (this.loaded) {
return this.loadedURL; return this.loadedURL;
} }
if (this.loadedTimeout) {
return require("@/assets/images/cardback.webp"); return require("@/assets/images/cardback.webp");
} }
return "";
}
} }
</script> </script>