summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-07-29 15:51:08 +0200
committerJulius Härtl <jus@bitgrid.net>2019-07-30 08:50:08 +0200
commit10ce9c68789ba0eef1a55a9f526b67437d61275d (patch)
treed99b7616c0c066361634b70e42565e66ac1225ff
parent48b271a2167bd0414a308b57e203e611d83bc817 (diff)
downloadnextcloud-server-10ce9c68789ba0eef1a55a9f526b67437d61275d.tar.gz
nextcloud-server-10ce9c68789ba0eef1a55a9f526b67437d61275d.zip
Force defaultHtml setting of v-tooltip to be disabled
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--apps/files_sharing/src/collaborationresources.js6
-rw-r--r--apps/updatenotification/src/components/root.vue2
-rw-r--r--settings/src/main-apps-users-management.js4
-rw-r--r--settings/src/main-personal-security.js2
4 files changed, 8 insertions, 6 deletions
diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
index 8fd0004f897..92a605ccb37 100644
--- a/apps/files_sharing/src/collaborationresources.js
+++ b/apps/files_sharing/src/collaborationresources.js
@@ -21,15 +21,15 @@
*/
import Vue from 'vue';
-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);
import View from './views/CollaborationView';
diff --git a/apps/updatenotification/src/components/root.vue b/apps/updatenotification/src/components/root.vue
index 83753369390..d8ffcd74bbe 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 e3149cabaf2..3261802a902 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);
@@ -55,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 };
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);