From 3d6e49aa6c64f170209ad0898ec68a58d5938a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
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 <jus@bitgrid.net>
---
apps/files_sharing/src/collaborationresources.js | 6 +++---
apps/updatenotification/src/components/root.vue | 2 ++
settings/src/main-apps-users-management.js | 4 ++--
settings/src/main-personal-security.js | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
index d95f3676374..27f268be852 100644
--- a/apps/files_sharing/src/collaborationresources.js
+++ b/apps/files_sharing/src/collaborationresources.js
@@ -22,14 +22,14 @@
import Vue from 'vue';
import Vuex from 'vuex';
-import { PopoverMenu } from 'nextcloud-vue';
+import { Tooltip, PopoverMenu } from 'nextcloud-vue';
import ClickOutside from 'vue-click-outside';
-import { VTooltip } from 'v-tooltip';
Vue.prototype.t = t;
Vue.component('PopoverMenu', PopoverMenu);
Vue.directive('ClickOutside', ClickOutside);
-Vue.directive('Tooltip', VTooltip);
+Tooltip.options.defaultHtml = false
+Vue.directive('Tooltip', Tooltip);
Vue.use(Vuex);
import View from './views/CollaborationView';
diff --git a/apps/updatenotification/src/components/root.vue b/apps/updatenotification/src/components/root.vue
index 54fc54cd2c1..0f6a427bb33 100644
--- a/apps/updatenotification/src/components/root.vue
+++ b/apps/updatenotification/src/components/root.vue
@@ -96,6 +96,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/main-apps-users-management.js b/settings/src/main-apps-users-management.js
index a23887458c9..a8627c2277d 100644
--- a/settings/src/main-apps-users-management.js
+++ b/settings/src/main-apps-users-management.js
@@ -28,7 +28,7 @@ import App from './App.vue';
import router from './router';
import store from './store';
-Vue.use(VTooltip);
+Vue.use(VTooltip, { defaultHtml: false });
sync(store, router);
@@ -54,4 +54,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 };
diff --git a/settings/src/main-personal-security.js b/settings/src/main-personal-security.js
index aaddd0a3332..799b15952e1 100644
--- a/settings/src/main-personal-security.js
+++ b/settings/src/main-personal-security.js
@@ -28,7 +28,7 @@ import AuthTokenSection from './components/AuthTokenSection';
__webpack_nonce__ = btoa(OC.requestToken);
Vue.use(VueClipboard);
-Vue.use(VTooltip);
+Vue.use(VTooltip, { defaultHtml: false });
Vue.prototype.t = t;
const View = Vue.extend(AuthTokenSection);
--
GitLab