sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 13:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflict from previous PR

Browse source
This commit is contained in:
Matteo Pagliazzi 2018-07-31 09:47:17 +02:00
parent c8becbccb5
commit 33149e1afa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
website/client/components/tasks/taskModal.vue
View file

@ -997,13 +997,13 @@ export default {
focusInput () {
this.$refs.inputToFocus.focus();
},
<<<<<<< HEAD
handleEsc (e) {
if (e.keyCode === 27 && this.showTagsSelect) {
=======
this.closeTagsPopup();
}
},
handleClick (e) {
if (this.$refs.popup && !this.$refs.popup.$el.contains(e.target)) {
>>>>>>> thefifthisa-clickout
this.closeTagsPopup();
}
},