From 5a9fb29c17615b6e6df1e1608868edcc2d3ce050 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 9 Aug 2018 21:50:09 -0600 Subject: [PATCH] Update bootstrap.js --- resources/assets/js/bootstrap.js | 46 ++++++-------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 4f95a589..461ee9b5 100644 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -1,13 +1,6 @@ - window._ = require('lodash'); window.Popper = require('popper.js').default; - -/** - * We'll load jQuery and the Bootstrap jQuery plugin which provides support - * for JavaScript based Bootstrap features such as modals and tabs. This - * code may be modified to fit the specific needs of your application. - */ - +import swal from 'sweetalert'; try { window.pixelfed = {}; window.$ = window.jQuery = require('jquery'); @@ -16,6 +9,7 @@ try { window.filesize = require('filesize'); window.typeahead = require('./lib/typeahead'); window.Bloodhound = require('./lib/bloodhound'); + window.Vue = require('vue'); require('./components/localstorage'); require('./components/likebutton'); @@ -23,45 +17,21 @@ try { require('./components/searchform'); require('./components/bookmarkform'); require('./components/statusform'); + + Vue.component( + 'follow-suggestions', + require('./components/FollowSuggestions.vue') + ); } catch (e) {} -/** - * We'll load the axios HTTP library which allows us to easily issue requests - * to our Laravel back-end. This library automatically handles sending the - * CSRF token as a header based on the value of the "XSRF" token cookie. - */ - +$('[data-toggle="tooltip"]').tooltip(); window.axios = require('axios'); window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; - -/** - * Next we will register the CSRF Token as a common header with Axios so that - * all outgoing HTTP requests automatically have it attached. This is just - * a simple convenience so we don't have to attach every token manually. - */ - 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'); } -/** - * Echo exposes an expressive API for subscribing to channels and listening - * for events that are broadcast by Laravel. Echo and event broadcasting - * allows your team to easily build robust real-time web applications. - */ - -// import Echo from 'laravel-echo' - -// window.Pusher = require('pusher-js'); - -// window.Echo = new Echo({ -// broadcaster: 'pusher', -// key: process.env.MIX_PUSHER_APP_KEY, -// cluster: process.env.MIX_PUSHER_APP_CLUSTER, -// encrypted: true -// });