Merge pull request #16607 from nextcloud/backport/16596

[stable16] Set proper defaults for v-tooltip usages
This commit is contained in:
Roeland Jago Douma 2019-07-31 08:33:38 +02:00 committed by GitHub
commit 51fd053d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 40 additions and 63 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{14:function(e,o,i){"use strict";i.r(o);var n=i(17),l=i(25),r=i(26),s=i.n(r),a=i(27),u={name:"CollaborationView",computed:{fileId:function(){return this.$root.model&&this.$root.model.id?""+this.$root.model.id:null},filename:function(){return this.$root.model&&this.$root.model.name?""+this.$root.model.name:""}},components:{CollectionList:i(30).a}},c=i(55),d=Object(c.a)(u,function(){var t=this.$createElement,e=this._self._c||t;return this.fileId?e("collection-list",{attrs:{type:"file",id:this.fileId,name:this.filename}}):this._e()},[],!1,null,null,null).exports;i.d(o,"Vue",function(){return n.a}),i.d(o,"View",function(){return d}),
(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{14:function(o,e,i){"use strict";i.r(e);var n=i(17),l=i(25),r=i(26),s=i.n(r),a={name:"CollaborationView",computed:{fileId:function(){return this.$root.model&&this.$root.model.id?""+this.$root.model.id:null},filename:function(){return this.$root.model&&this.$root.model.name?""+this.$root.model.name:""}},components:{CollectionList:i(29).a}},u=i(54),c=Object(u.a)(a,function(){var t=this.$createElement,o=this._self._c||t;return this.fileId?o("collection-list",{attrs:{type:"file",id:this.fileId,name:this.filename}}):this._e()},[],!1,null,null,null).exports;i.d(e,"Vue",function(){return n.a}),i.d(e,"View",function(){return c}),
/*
* @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net>
*
@ -20,5 +20,5 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
n.a.prototype.t=t,n.a.component("PopoverMenu",l.PopoverMenu),n.a.directive("ClickOutside",s.a),n.a.directive("Tooltip",a.a)}}]);
n.a.prototype.t=t,n.a.component("PopoverMenu",l.PopoverMenu),n.a.directive("ClickOutside",s.a),l.Tooltip.options.defaultHtml=!1,n.a.directive("Tooltip",l.Tooltip)}}]);
//# sourceMappingURL=files_sharing.4.js.map

File diff suppressed because one or more lines are too long

View File

@ -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';

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -96,6 +96,8 @@
import { VTooltip } from 'v-tooltip';
import ClickOutside from 'vue-click-outside';
VTooltip.options.defaultHtml = false
export default {
name: 'root',
components: {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -395,5 +395,5 @@ t.exports=function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
i.nc=btoa(OC.requestToken),r.a.use(a.a),r.a.use(s.a),r.a.prototype.t=t,new(r.a.extend(k))({propsData:{tokens:OCP.InitialState.loadState("settings","app_tokens")}}).$mount("#security")}]);
i.nc=btoa(OC.requestToken),r.a.use(a.a),r.a.use(s.a,{defaultHtml:!1}),r.a.prototype.t=t,new(r.a.extend(k))({propsData:{tokens:OCP.InitialState.loadState("settings","app_tokens")}}).$mount("#security")}]);
//# sourceMappingURL=vue-settings-personal-security.js.map

File diff suppressed because one or more lines are too long

View File

@ -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 };
export { app, router, store };

View File

@ -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);