misc fixes - sep 17 (#9045)
* 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:
@@ -171,6 +171,10 @@
|
||||
position: inherit;
|
||||
width: 180px;
|
||||
}
|
||||
|
||||
.popover-content {
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -11,9 +11,8 @@ div
|
||||
span.item-label(v-if="label") {{ label }}
|
||||
|
||||
b-popover(
|
||||
v-if="showPopover",
|
||||
:target="itemId",
|
||||
triggers="hover",
|
||||
:triggers="showPopover ? 'hover' : ''",
|
||||
:placement="popoverPosition",
|
||||
)
|
||||
slot(name="popoverContent", :item="item")
|
||||
|
||||
Reference in New Issue
Block a user