summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-03-01 13:59:35 +0100
committerJulius Härtl <jus@bitgrid.net>2019-03-01 13:59:35 +0100
commit2f791f230ff987a32f18f91bcb04bd4fd1b62d6a (patch)
tree7585f6d955cfcdee85bca17edecdf616848cb5c3 /src
parenta19ce861b2b535811d051f613309d7248d8ff833 (diff)
Fix click event and tooltip usage
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'src')
-rw-r--r--src/components/Composer.vue6
-rw-r--r--src/main.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 28aee629..3e0049df 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -53,9 +53,9 @@
</vue-tribute>
<emoji-picker ref="emojiPicker" :search="search" class="emoji-picker-wrapper"
@emoji="insert">
- <a slot="emoji-invoker" v-tooltip="'Insert emoji'" slot-scope="{ events }"
- class="emoji-invoker" tabindex="0" v-on="events"
- @keyup.enter="events.click" @keyup.space="events.click" />
+ <div slot="emoji-invoker" v-tooltip="'Insert emoji'" slot-scope="{ events }"
+ class="emoji-invoker" tabindex="0" @keyup.enter="events.click"
+ @keyup.space="events.click" @click.stop="events.click" />
<!-- eslint-disable-next-line vue/no-template-shadow -->
<div slot="emoji-picker" slot-scope="{ emojis, insert }" class="emoji-picker popovermenu">
<div>
diff --git a/src/main.js b/src/main.js
index 3016c5ec..cc235656 100644
--- a/src/main.js
+++ b/src/main.js
@@ -48,7 +48,7 @@ Vue.prototype.OC = OC
Vue.prototype.OCA = OCA
Vue.directive('ClickOutside', ClickOutside)
-Vue.use(VTooltip)
+Vue.directive('Tooltip', VTooltip)
Vue.use(contenteditableDirective)
Vue.use(vuetwemoji, {
baseUrl: OC.linkTo('social', 'img/'), // can set to local folder of emojis. default: https://twemoji.maxcdn.com/