From 2bc1e5b2cedc04481997a08235824f64f17432f1 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 3 Nov 2018 22:08:32 -0600 Subject: [PATCH] Update bootstrap.js --- resources/assets/js/bootstrap.js | 103 ++----------------------------- 1 file changed, 6 insertions(+), 97 deletions(-) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 9c1431239..63218f7ee 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -1,113 +1,22 @@ window._ = require('lodash'); window.Popper = require('popper.js').default; import swal from 'sweetalert'; - window.pixelfed = {}; window.$ = window.jQuery = require('jquery'); require('bootstrap'); +window.InfiniteScroll = require('infinite-scroll'); +window.filesize = require('filesize'); +window.typeahead = require('./lib/typeahead'); +window.Bloodhound = require('./lib/bloodhound'); window.Vue = require('vue'); import BootstrapVue from 'bootstrap-vue' Vue.use(BootstrapVue); - -try { - window.InfiniteScroll = require('infinite-scroll'); - window.filesize = require('filesize'); - window.typeahead = require('./lib/typeahead'); - window.Bloodhound = require('./lib/bloodhound'); - require('./components/localstorage'); - require('./components/likebutton'); - require('./components/commentform'); - require('./components/searchform'); - require('./components/bookmarkform'); - require('./components/statusform'); - // require('./components/embed'); - // require('./components/shortcuts'); - - Vue.component( - 'follow-suggestions', - require('./components/FollowSuggestions.vue') - ); - - // Vue.component( - // 'circle-panel', - // require('./components/CirclePanel.vue') - // ); - - // Vue.component( - // 'post-presenter', - // require('./components/PostPresenter.vue') - // ); - - // Vue.component( - // 'post-comments', - // require('./components/PostComments.vue') - // ); - - Vue.component( - 'passport-clients', - require('./components/passport/Clients.vue') - ); - - Vue.component( - 'passport-authorized-clients', - require('./components/passport/AuthorizedClients.vue') - ); - - Vue.component( - 'passport-personal-access-tokens', - require('./components/passport/PersonalAccessTokens.vue') - ); - -} catch (e) {} - -$(document).ready(function() { - $(function () { - $('[data-toggle="tooltip"]').tooltip() - }); -}); - window.axios = require('axios'); - window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; + let token = document.head.querySelector('meta[name="csrf-token"]'); if (token) { window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; } else { console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token'); -} - -// import Echo from "laravel-echo" - -// window.io = require('socket.io-client'); - -// window.pixelfed.bootEcho = function() { -// window.Echo = new Echo({ -// broadcaster: 'socket.io', -// host: window.location.hostname + ':2096', -// auth: { -// headers: { -// Authorization: 'Bearer ' + token.content, -// }, -// }, -// }); -// } - -window.pixelfed.copyToClipboard = (str) => { - const el = document.createElement('textarea'); - el.value = str; - el.setAttribute('readonly', ''); - el.style.position = 'absolute'; - el.style.left = '-9999px'; - document.body.appendChild(el); - const selected = - document.getSelection().rangeCount > 0 - ? document.getSelection().getRangeAt(0) - : false; - el.select(); - document.execCommand('copy'); - document.body.removeChild(el); - if (selected) { - document.getSelection().removeAllRanges(); - document.getSelection().addRange(selected); - } -}; \ No newline at end of file +} \ No newline at end of file