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

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2018-02-01 21:09:57 +00:00
parent 6a5bd1b0a5 3e0a7c70ed
commit b706db43e4
11 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/tasks/brokenTaskModal.vue
View File

@@ -48,8 +48,8 @@ export default {
this.$root.$emit('bv::show::modal', 'broken-task-modal');
});
},
removed () {
this.$root.$remove('handle-broken-task');
beforeDestroy () {
this.$root.$off('handle-broken-task');
},
methods: {
...mapActions({

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

@@ -192,10 +192,7 @@ export default {
this.castEnd(target, type, $event);
});
document.addEventListener('keyup', keyEvent => {
if (keyEvent.keyCode !== 27) return;
this.castCancel();
});
document.addEventListener('keyup', this.handleKeyUp);
// @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);
@@ -203,6 +200,10 @@ export default {
this.$store.state.spellOptions.spellDrawOpen = false;
}
},
beforeDestroy () {
this.$root.$off('castEnd');
document.removeEventListener('keyup', this.handleKeyUp);
},
computed: {
...mapState({user: 'user.data'}),
openStatus () {
@@ -210,6 +211,10 @@ export default {
},
},
methods: {
handleKeyUp (keyEvent) {
if (keyEvent.keyCode !== 27) return;
this.castCancel();
},
drawerToggled (newState) {
this.$store.state.spellOptions.spellDrawOpen = newState;