From 37814333a5b41d8771222fa5245e4cbe48dfdc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 29 Jul 2019 15:51:08 +0200 Subject: [PATCH] Force defaultHtml setting of v-tooltip to be disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/updatenotification/src/components/root.vue | 2 ++ settings/src/components/userList/userRow.vue | 3 --- settings/src/main.js | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/updatenotification/src/components/root.vue b/apps/updatenotification/src/components/root.vue index fe4be7fb6b4..1c7e35aa586 100644 --- a/apps/updatenotification/src/components/root.vue +++ b/apps/updatenotification/src/components/root.vue @@ -94,6 +94,8 @@ import { VTooltip } from 'v-tooltip'; import ClickOutside from 'vue-click-outside'; + VTooltip.options.defaultHtml = false + export default { name: 'root', components: { diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue index 382ed310606..84e6c1db00c 100644 --- a/settings/src/components/userList/userRow.vue +++ b/settings/src/components/userList/userRow.vue @@ -131,9 +131,6 @@ import popoverMenu from '../popoverMenu'; import ClickOutside from 'vue-click-outside'; import Multiselect from 'vue-multiselect'; import Vue from 'vue' -import VTooltip from 'v-tooltip' - -Vue.use(VTooltip) export default { name: 'userRow', diff --git a/settings/src/main.js b/settings/src/main.js index c24eee87628..84fe21631eb 100644 --- a/settings/src/main.js +++ b/settings/src/main.js @@ -23,12 +23,15 @@ import "@babel/polyfill"; import Vue from 'vue'; import { sync } from 'vuex-router-sync'; +import VTooltip from 'v-tooltip' import App from './App.vue'; import router from './router'; import store from './store'; sync(store, router); +Vue.use(VTooltip, { defaultHtml: false }); + // CSP config for webpack dynamic chunk loading // eslint-disable-next-line __webpack_nonce__ = btoa(OC.requestToken) @@ -52,4 +55,4 @@ const app = new Vue({ render: h => h(App) }).$mount('#content'); -export { app, router, store }; \ No newline at end of file +export { app, router, store };