From 5ddcdc6c7ab8d0472ac98eb932fb85ff10ec341d Mon Sep 17 00:00:00 2001 From: talon Date: Fri, 3 May 2019 23:11:09 -0400 Subject: [PATCH] review changes --- package.json | 6 +++--- resources/assets/js/bootstrap.js | 6 ------ resources/assets/js/components.js | 8 ++++++++ resources/assets/js/components/PostComponent.vue | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 838400e84..5e976d7e7 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "sweetalert": "^2.1.2", "twitter-text": "^2.0.5", "vue-content-loader": "^0.2.1", - "vue-infinite-loading": "^2.4.3", - "vue-loading-overlay": "^3.1.1", - "vue-timeago": "^5.0.0", + "vue-infinite-loading": "^2.4.4", + "vue-loading-overlay": "^3.2.0", + "vue-timeago": "^5.1.2", "vue-touch": "^2.0.0-beta.4" }, "collective": { diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index cbd10ca31..ad0c293af 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -7,12 +7,6 @@ window.axios = require('axios'); window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; require('readmore-js'); -Vue.use(require("vue-touch"), {name: "v-touch"}) -VueTouch.registerCustomEvent('doubletap', { - type: 'tap', - taps: 2 -}) - let token = document.head.querySelector('meta[name="csrf-token"]'); if (token) { window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; diff --git a/resources/assets/js/components.js b/resources/assets/js/components.js index 23b7709fc..06d3228ef 100644 --- a/resources/assets/js/components.js +++ b/resources/assets/js/components.js @@ -3,6 +3,7 @@ import BootstrapVue from 'bootstrap-vue' import InfiniteLoading from 'vue-infinite-loading'; import Loading from 'vue-loading-overlay'; import VueTimeago from 'vue-timeago'; +import VueTouch from 'vue-touch'; //import {Howl, Howler} from 'howler'; Vue.use(BootstrapVue); @@ -10,6 +11,13 @@ Vue.use(InfiniteLoading); Vue.use(Loading); Vue.use(VueTimeago); +Vue.use(VueTouch, { name: 'v-touch' }) +VueTouch.registerCustomEvent('doubletap', { + type: 'tap', + taps: 2 +}) + + pixelfed.readmore = () => { $('.read-more').each(function(k,v) { let el = $(this); diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index 9ba370204..0101f10eb 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -212,7 +212,7 @@
-
+