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

Remember equipment drawer tab (#10458)

Browse Source 
* Remember equipment drawer tab

* Split local setting value constants
This commit is contained in:
Dexx Mandele
2018-06-27 19:08:21 +02:00
committed by Matteo Pagliazzi
parent d549fea4ed
commit c91da86b89
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
website/client/components/inventory/equipment/index.vue
View File

@@ -36,7 +36,7 @@
drawer( drawer(
:title="$t('equipment')", :title="$t('equipment')",
:errorMessage="(costume && !user.preferences.costume) ? $t('costumeDisabled') : null", :errorMessage="(costumeMode && !user.preferences.costume) ? $t('costumeDisabled') : null",
:openStatus='openStatus', :openStatus='openStatus',
v-on:toggled='drawerToggled' v-on:toggled='drawerToggled'
) )
@@ -44,18 +44,18 @@
.drawer-tab-container .drawer-tab-container
.drawer-tab.text-right .drawer-tab.text-right
a.drawer-tab-text( a.drawer-tab-text(
@click="costume = false", @click="selectDrawerTab('equipment')",
:class="{'drawer-tab-text-active': costume === false}", :class="{'drawer-tab-text-active': !costumeMode}",
) {{ $t('equipment') }} ) {{ $t('equipment') }}
.clearfix .clearfix
.drawer-tab.float-left .drawer-tab.float-left
a.drawer-tab-text( a.drawer-tab-text(
@click="costume = true", @click="selectDrawerTab('costume')",
:class="{'drawer-tab-text-active': costume === true}", :class="{'drawer-tab-text-active': costumeMode}",
) {{ $t('costume') }} ) {{ $t('costume') }}
toggle-switch.float-right.align-with-tab( toggle-switch.float-right.align-with-tab(
:label="$t(costume ? 'useCostume' : 'autoEquipBattleGear')", :label="$t(costumeMode ? 'useCostume' : 'autoEquipBattleGear')",
:checked="user.preferences[drawerPreference]", :checked="user.preferences[drawerPreference]",
@change="changeDrawerPreference", @change="changeDrawerPreference",
:hoverText="$t(drawerPreference+'PopoverText')", :hoverText="$t(drawerPreference+'PopoverText')",
@@ -77,7 +77,7 @@
template(slot="itemBadge", slot-scope="context") template(slot="itemBadge", slot-scope="context")
starBadge( starBadge(
:selected="true", :selected="true",
:show="!costume || user.preferences.costume", :show="!costumeMode || user.preferences.costume",
@click="equipItem(context.item)", @click="equipItem(context.item)",
) )
div( div(
@@ -109,7 +109,7 @@
template(slot="itemBadge", slot-scope="context") template(slot="itemBadge", slot-scope="context")
starBadge( starBadge(
:selected="activeItems[context.item.type] === context.item.key", :selected="activeItems[context.item.type] === context.item.key",
:show="!costume || user.preferences.costume", :show="!costumeMode || user.preferences.costume",
@click="equipItem(context.item)", @click="equipItem(context.item)",
) )
template(slot="popoverContent", slot-scope="context") template(slot="popoverContent", slot-scope="context")
@@ -119,7 +119,7 @@
:item="gearToEquip", :item="gearToEquip",
@equipItem="equipItem($event)", @equipItem="equipItem($event)",
@change="changeModalState($event)", @change="changeModalState($event)",
:costumeMode="costume", :costumeMode="costumeMode",
:isEquipped="gearToEquip == null ? false : activeItems[gearToEquip.type] === gearToEquip.key" :isEquipped="gearToEquip == null ? false : activeItems[gearToEquip.type] === gearToEquip.key"
) )
</template> </template>
@@ -185,7 +185,7 @@ export default {
itemsPerLine: 9, itemsPerLine: 9,
searchText: null, searchText: null,
searchTextThrottled: null, searchTextThrottled: null,
costume: false, costumeMode: false,
groupBy: 'type', // or 'class' groupBy: 'type', // or 'class'
gearTypesToStrings: Object.freeze({ // TODO use content.itemList? gearTypesToStrings: Object.freeze({ // TODO use content.itemList?
weapon: i18n.t('weaponCapitalized'), weapon: i18n.t('weaponCapitalized'),
@@ -219,11 +219,24 @@ export default {
}, },
mounted () { mounted () {
const drawerState = getLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE); const drawerState = getLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE);
if (drawerState === CONSTANTS.valueConstants.DRAWER_CLOSED) { if (drawerState === CONSTANTS.drawerStateValues.DRAWER_CLOSED) {
this.$store.state.equipmentDrawerOpen = false; this.$store.state.equipmentDrawerOpen = false;
} }
this.costumeMode = getLocalSetting(CONSTANTS.keyConstants.CURRENT_EQUIPMENT_DRAWER_TAB) === CONSTANTS.equipmentDrawerTabValues.COSTUME_TAB ? true : false;
}, },
methods: { methods: {
selectDrawerTab (tabName) {
let tabNameValue;
if (tabName === 'costume') {
tabNameValue = CONSTANTS.equipmentDrawerTabValues.COSTUME_TAB;
this.costumeMode = true;
} else {
tabNameValue = CONSTANTS.equipmentDrawerTabValues.EQUIPMENT_TAB;
this.costumeMode = false;
}
setLocalSetting(CONSTANTS.keyConstants.CURRENT_EQUIPMENT_DRAWER_TAB, tabNameValue);
},
openEquipDialog (item) { openEquipDialog (item) {
this.gearToEquip = item; this.gearToEquip = item;
}, },
@@ -233,7 +246,7 @@ export default {
} }
}, },
equipItem (item) { equipItem (item) {
this.$store.dispatch('common:equip', {key: item.key, type: this.costume ? 'costume' : 'equipped'}); this.$store.dispatch('common:equip', {key: item.key, type: this.costumeMode ? 'costume' : 'equipped'});
this.gearToEquip = null; this.gearToEquip = null;
}, },
changeDrawerPreference (newVal) { changeDrawerPreference (newVal) {
@@ -260,11 +273,11 @@ export default {
this.$store.state.equipmentDrawerOpen = newState; this.$store.state.equipmentDrawerOpen = newState;
if (newState) { if (newState) {
setLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_OPEN); setLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE, CONSTANTS.drawerStateValues.DRAWER_OPEN);
return; return;
} }
setLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_CLOSED); setLocalSetting(CONSTANTS.keyConstants.EQUIPMENT_DRAWER_STATE, CONSTANTS.drawerStateValues.DRAWER_CLOSED);
}, },
}, },
computed: { computed: {
@@ -280,10 +293,10 @@ export default {
return this.$store.state.equipmentDrawerOpen ? 1 : 0; return this.$store.state.equipmentDrawerOpen ? 1 : 0;
}, },
drawerPreference () { drawerPreference () {
return this.costume === true ? 'costume' : 'autoEquip'; return this.costumeMode ? 'costume' : 'autoEquip';
}, },
activeItems () { activeItems () {
return this.costume === true ? this.costumeItems : this.equippedItems; return this.costumeMode ? this.costumeItems : this.equippedItems;
}, },
gearItemsByType () { gearItemsByType () {
const searchText = this.searchTextThrottled; const searchText = this.searchTextThrottled;

6
website/client/components/tasks/spells.vue
View File

@@ -190,7 +190,7 @@ export default {
mounted () { mounted () {
// @TODO: should we abstract the drawer state/local store to a library and mixing combo? We use a similar pattern in equipment // @TODO: should we abstract the drawer state/local store to a library and mixing combo? We use a similar pattern in equipment
const spellDrawerState = getLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE); const spellDrawerState = getLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE);
if (spellDrawerState === CONSTANTS.valueConstants.DRAWER_CLOSED) { if (spellDrawerState === CONSTANTS.drawerStateValues.DRAWER_CLOSED) {
this.$store.state.spellOptions.spellDrawOpen = false; this.$store.state.spellOptions.spellDrawOpen = false;
} }
}, },
@@ -205,11 +205,11 @@ export default {
this.$store.state.spellOptions.spellDrawOpen = newState; this.$store.state.spellOptions.spellDrawOpen = newState;
if (newState) { if (newState) {
setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_OPEN); setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.drawerStateValues.DRAWER_OPEN);
return; return;
} }
setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.valueConstants.DRAWER_CLOSED); setLocalSetting(CONSTANTS.keyConstants.SPELL_DRAWER_STATE, CONSTANTS.drawerStateValues.DRAWER_CLOSED);
}, },
spellDisabled (skill) { spellDisabled (skill) {
if (skill === 'frost' && this.user.stats.buffs.streaks) { if (skill === 'frost' && this.user.stats.buffs.streaks) {

7
website/client/libs/userlocalManager.js
View File

@@ -3,11 +3,16 @@ const CONSTANTS = {
keyConstants: { keyConstants: {
SPELL_DRAWER_STATE: 'spell-drawer-state', SPELL_DRAWER_STATE: 'spell-drawer-state',
EQUIPMENT_DRAWER_STATE: 'equipment-drawer-state', EQUIPMENT_DRAWER_STATE: 'equipment-drawer-state',
CURRENT_EQUIPMENT_DRAWER_TAB: 'current-equipment-drawer-tab',
}, },
valueConstants: { drawerStateValues: {
DRAWER_CLOSED: 'drawer-closed', DRAWER_CLOSED: 'drawer-closed',
DRAWER_OPEN: 'drawer-open', DRAWER_OPEN: 'drawer-open',
}, },
equipmentDrawerTabValues: {
COSTUME_TAB: 'costume-tab',
EQUIPMENT_TAB: 'equipment-tab',
},
}; };
function setLocalSetting (key, value) { function setLocalSetting (key, value) {