krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 23:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix issues

Browse Source
This commit is contained in:
negue
2018-10-22 21:22:26 +02:00
parent 456c5e57bc
commit 16256ee190
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/client/components/inventory/stable/petItem.vue
View File

@@ -8,7 +8,7 @@ div
span.item-content.hatchAgain(v-if="mountOwned && isHatchable") span.item-content.hatchAgain(v-if="mountOwned && isHatchable")
span.egg(:class="eggClass") span.egg(:class="eggClass")
span.potion(:class="potionClass") span.potion(:class="potionClass")
span.item-content(v-else, :class="getPetItemClass(item)") span.item-content(v-else, :class="getPetItemClass()")
span.pet-progress-background(v-if="item.isAllowedToFeed() && progress > 0") span.pet-progress-background(v-if="item.isAllowedToFeed() && progress > 0")
div.pet-progress-bar(v-bind:style="{width: 100 * progress/50 + '%' }") div.pet-progress-bar(v-bind:style="{width: 100 * progress/50 + '%' }")
span.item-label(v-if="label") {{ label }} span.item-label(v-if="label") {{ label }}
@@ -111,13 +111,13 @@ div
click () { click () {
this.$emit('click', {}); this.$emit('click', {});
}, },
getPetItemClass (pet) { getPetItemClass () {
if (this.mountOwned && !this.isHatchable) { if (this.mountOwned && !this.isHatchable) {
return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`; return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
} }
if (this.isOwned) { if (this.item.isOwned()) {
return `Pet Pet-${pet.key} ${pet.eggKey}`; return `Pet Pet-${this.item.key} ${this.item.eggKey}`;
} }
if (this.isHatchable) { if (this.isHatchable) {
@@ -125,7 +125,7 @@ div
} }
if (this.mountOwned) { if (this.mountOwned) {
return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`; return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
} }
// Can't hatch // Can't hatch
@@ -139,9 +139,6 @@ div
eggClass () { eggClass () {
return `Pet_Egg_${this.item.eggKey}`; return `Pet_Egg_${this.item.eggKey}`;
}, },
isOwned () {
return this.item.isOwned();
},
isHatchable () { isHatchable () {
return this.item.isHatchable(); return this.item.isHatchable();
}, },