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

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
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 () { focusInput () {
this.$refs.inputToFocus.focus(); this.$refs.inputToFocus.focus();
}, },
<<<<<<< HEAD
handleEsc (e) { handleEsc (e) {
if (e.keyCode === 27 && this.showTagsSelect) { if (e.keyCode === 27 && this.showTagsSelect) {
======= this.closeTagsPopup();
}
},
handleClick (e) { handleClick (e) {
if (this.$refs.popup && !this.$refs.popup.$el.contains(e.target)) { if (this.$refs.popup && !this.$refs.popup.$el.contains(e.target)) {
>>>>>>> thefifthisa-clickout
this.closeTagsPopup(); this.closeTagsPopup();
} }
}, },