multiple fixes sep 24 (#9073)

* pin purchase-gems + orb of rebirth

* show questInfo in items inventory and reward column

* un-equip gear using the star / clicking on the drawer
This commit is contained in:
negue
2017-09-25 20:12:49 +02:00
committed by GitHub
parent a317b351be
commit 2a43df34c0
6 changed files with 69 additions and 23 deletions

View File

@@ -114,8 +114,13 @@
@click="itemClicked(group.key, context.item)",
)
template(slot="popoverContent", scope="context")
h4.popover-content-title {{ context.item.text }}
.popover-content-text(v-html="context.item.notes")
div.questPopover(v-if="group.key === 'quests'")
h4.popover-content-title {{ context.item.text }}
questInfo(:quest="context.item")
div(v-else)
h4.popover-content-title {{ context.item.text }}
.popover-content-text(v-html="context.item.notes")
template(slot="itemBadge", scope="context")
countBadge(
:show="true",
@@ -191,6 +196,8 @@ import startQuestModal from '../../groups/startQuestModal';
import createAnimal from 'client/libs/createAnimal';
import QuestInfo from '../../shops/quests/questInfo.vue';
import moment from 'moment';
const allowedSpecialItems = ['snowball', 'spookySparkles', 'shinySeed', 'seafoam'];
@@ -228,6 +235,7 @@ export default {
CountBadge,
startQuestModal,
cardsModal,
QuestInfo,
},
directives: {
drag: DragDropDirective,