UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

review changes

Browse source
This commit is contained in:
talon 2019-05-03 23:11:09 -04:00
parent ea9d5d9826
commit 5ddcdc6c7a
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -43,9 +43,9 @@
"sweetalert": "^2.1.2", "sweetalert": "^2.1.2",
"twitter-text": "^2.0.5", "twitter-text": "^2.0.5",
"vue-content-loader": "^0.2.1", "vue-content-loader": "^0.2.1",
"vue-infinite-loading": "^2.4.3", "vue-infinite-loading": "^2.4.4",
"vue-loading-overlay": "^3.1.1", "vue-loading-overlay": "^3.2.0",
"vue-timeago": "^5.0.0", "vue-timeago": "^5.1.2",
"vue-touch": "^2.0.0-beta.4" "vue-touch": "^2.0.0-beta.4"
}, },
"collective": { "collective": {

6
resources/assets/js/bootstrap.js vendored
View file

@ -7,12 +7,6 @@ window.axios = require('axios');
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
require('readmore-js'); 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"]'); let token = document.head.querySelector('meta[name="csrf-token"]');
if (token) { if (token) {
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;

8
resources/assets/js/components.js vendored
View file

@ -3,6 +3,7 @@ import BootstrapVue from 'bootstrap-vue'
import InfiniteLoading from 'vue-infinite-loading'; import InfiniteLoading from 'vue-infinite-loading';
import Loading from 'vue-loading-overlay'; import Loading from 'vue-loading-overlay';
import VueTimeago from 'vue-timeago'; import VueTimeago from 'vue-timeago';
import VueTouch from 'vue-touch';
//import {Howl, Howler} from 'howler'; //import {Howl, Howler} from 'howler';
Vue.use(BootstrapVue); Vue.use(BootstrapVue);
@ -10,6 +11,13 @@ Vue.use(InfiniteLoading);
Vue.use(Loading); Vue.use(Loading);
Vue.use(VueTimeago); Vue.use(VueTimeago);
Vue.use(VueTouch, { name: 'v-touch' })
VueTouch.registerCustomEvent('doubletap', {
type: 'tap',
taps: 2
})
pixelfed.readmore = () => { pixelfed.readmore = () => {
$('.read-more').each(function(k,v) { $('.read-more').each(function(k,v) {
let el = $(this); let el = $(this);

2
resources/assets/js/components/PostComponent.vue
View file

@ -212,7 +212,7 @@
<div v-if="profileLayout == 'moment'" class="momentui"> <div v-if="profileLayout == 'moment'" class="momentui">
<div class="bg-dark mt-md-n4"> <div class="bg-dark mt-md-n4">
<div class="container" v-on:doubletap="likeStatus(status, $event)"> <div class="container" v-on:doubletap="likeStatus">
<div class="postPresenterContainer d-none d-flex justify-content-center align-items-center bg-dark"> <div class="postPresenterContainer d-none d-flex justify-content-center align-items-center bg-dark">
<div v-if="status.pf_type === 'photo'" class="w-100"> <div v-if="status.pf_type === 'photo'" class="w-100">
<photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter> <photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter>