Skip to content

[stable15] Set proper defaults for v-tooltip usages #16608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Jul 31, 2019
Merged

[stable15] Set proper defaults for v-tooltip usages #16608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3781433
Force defaultHtml setting of v-tooltip to be disabled
juliusknorr Jul 29, 2019
058f88d
Bump bundles
juliusknorr Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/updatenotification/js/updatenotification.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/updatenotification/js/updatenotification.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions apps/updatenotification/src/components/root.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
import { VTooltip } from 'v-tooltip';
import ClickOutside from 'vue-click-outside';

VTooltip.options.defaultHtml = false

export default {
name: 'root',
components: {
Expand Down
2 changes: 1 addition & 1 deletion settings/js/0.js
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 2 additions & 27 deletions settings/js/3.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/3.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/4.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/4.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions settings/js/settings-admin-security.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/settings-admin-security.js.map
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 33 additions & 8 deletions settings/js/settings-vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/settings-vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions settings/src/components/userList/userRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 4 additions & 1 deletion settings/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -52,4 +55,4 @@ const app = new Vue({
render: h => h(App)
}).$mount('#content');

export { app, router, store };
export { app, router, store };