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

misc fixes - sep 17 (#9045)

Browse Source 
* not locking pre-owned gear - pin removed gear on revive

* fix createAnimal (check for function) - hide pet-popover while dragging food

* fix dragging popover text color

* fix drop toasts

* selectMembersModal: load members on item change
This commit is contained in:
negue
2017-09-19 22:45:28 +02:00
committed by GitHub
parent b1652ddd97
commit 2cb9228a7c
9 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/client/components/inventory/stable/index.vue
View File

@@ -99,7 +99,7 @@
:popoverPosition="'top'",
:progress="context.item.progress",
:emptyItem="!context.item.isOwned()",
:showPopover="true",
:showPopover="currentDraggingFood == null",
:highlightBorder="highlightPet == context.item.key",
@click="petClicked(context.item)"
)
@@ -453,6 +453,10 @@
position: inherit;
width: 100px;
}
.popover-content {
color: white;
}
}
.hatchablePopover {
@@ -909,11 +913,13 @@
},
petClicked (pet) {
if (this.currentDraggingFood !== null && pet.isAllowedToFeed()) {
// food process
this.feedAction(pet.key, this.currentDraggingFood.key);
this.currentDraggingFood = null;
this.foodClickMode = false;
if (this.currentDraggingFood !== null) {
if (pet.isAllowedToFeed()) {
// food process
this.feedAction(pet.key, this.currentDraggingFood.key);
this.currentDraggingFood = null;
this.foodClickMode = false;
}
} else {
if (pet.isOwned()) {
this.selectPet(pet);