Fixes a corner case with exclamation in the ID.

[bookstack] / resources / assets / js / index.js

diff --git a/resources/assets/js/index.js b/resources/assets/js/index.js
index 08b9f58ffbb324cc3ba19da09a7fe878166a770b..6b24d5ee118820f204b10ce6b1b97982c0231f75 100644 (file)
--- a/resources/assets/js/index.js
+++ b/resources/assets/js/index.js
@@ -1,12 +1,6 @@
-import "babel-polyfill"
-import "./dom-polyfills"
-import "./pages/page-show"
-import Translations from "./translations"
-import vues from "./vues/vues"
-import components from "./components"
-
-import Vue from "vue"
-import axios from "axios"
+// Global Polyfills
+import "@babel/polyfill"
+import "./services/dom-polyfills"

 
 // Url retrieval function
 window.baseUrl = function(path) {
 
 // Url retrieval function
 window.baseUrl = function(path) {


@@ -16,114 +10,30 @@ window.baseUrl = function(path) {
     return basePath + '/' + path;
 };
 
     return basePath + '/' + path;
 };
 

-// Global Event System
-class EventManager {
-    constructor() {
-        this.listeners = {};
-        this.stack = [];
-    }
-
-    emit(eventName, eventData) {
-        this.stack.push({name: eventName, data: eventData});
-        if (typeof this.listeners[eventName] === 'undefined') return this;
-        let eventsToStart = this.listeners[eventName];
-        for (let i = 0; i < eventsToStart.length; i++) {
-            let event = eventsToStart[i];
-            event(eventData);
-        }
-        return this;
-    }
-
-    listen(eventName, callback) {
-        if (typeof this.listeners[eventName] === 'undefined') this.listeners[eventName] = [];
-        this.listeners[eventName].push(callback);
-        return this;
-    }
-}
-
-window.$events = new EventManager();
-
-let axiosInstance = axios.create({
-    headers: {
-        'X-CSRF-TOKEN': document.querySelector('meta[name=token]').getAttribute('content'),
-        'baseURL': window.baseUrl('')
-    }
-});
-axiosInstance.interceptors.request.use(resp => {
-    return resp;
-}, err => {
-    if (typeof err.response === "undefined" || typeof err.response.data === "undefined") return Promise.reject(err);
-    if (typeof err.response.data.error !== "undefined") window.$events.emit('error', err.response.data.error);
-    if (typeof err.response.data.message !== "undefined") window.$events.emit('error', err.response.data.message);
-});
-window.$http = axiosInstance;
-
-Vue.prototype.$http = axiosInstance;
-Vue.prototype.$events = window.$events;
+// Set events and http services on window
+import Events from "./services/events"
+import Http from "./services/http"
+let httpInstance = Http();
+window.$http = httpInstance;
+window.$events = new Events();

 
 // Translation setup
 // Creates a global function with name 'trans' to be used in the same way as Laravel's translation system
 
 // Translation setup
 // Creates a global function with name 'trans' to be used in the same way as Laravel's translation system

+import Translations from "./services/translations"

 let translator = new Translations(window.translations);
 window.trans = translator.get.bind(translator);
 window.trans_choice = translator.getPlural.bind(translator);
 
 let translator = new Translations(window.translations);
 window.trans = translator.get.bind(translator);
 window.trans_choice = translator.getPlural.bind(translator);
 

-// Load vues and components
-vues();
-components();
-
+// Load in global UI helpers and libraries including jQuery
+import "./services/global-ui"

 
 

-//Global jQuery Config & Extensions
-
-/**
- * Scroll the view to a specific element.
- * @param {HTMLElement} element
- */
-window.scrollToElement = function(element) {
-    if (!element) return;
-    let offset = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
-    let top = element.getBoundingClientRect().top + offset;
-    $('html, body').animate({
-        scrollTop: top - 60 // Adjust to change final scroll position top margin
-    }, 300);
-};
-
-/**
- * Scroll and highlight an element.
- * @param {HTMLElement} element
- */
-window.scrollAndHighlight = function(element) {
-    if (!element) return;
-    window.scrollToElement(element);
-    let color = document.getElementById('custom-styles').getAttribute('data-color-light');
-    let initColor = window.getComputedStyle(element).getPropertyValue('background-color');
-    element.style.backgroundColor = color;
-    setTimeout(() => {
-        element.classList.add('selectFade');
-        element.style.backgroundColor = initColor;
-    }, 10);
-    setTimeout(() => {
-        element.classList.remove('selectFade');
-        element.style.backgroundColor = '';
-    }, 3000);
-};
-
-// Smooth scrolling
-jQuery.fn.smoothScrollTo = function () {
-    if (this.length === 0) return;
-    window.scrollToElement(this[0]);
-    return this;
-};
-
-// Making contains text expression not worry about casing
-jQuery.expr[":"].contains = $.expr.createPseudo(function (arg) {
-    return function (elem) {
-        return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
-    };
-});
+// Set services on Vue
+import Vue from "vue"
+Vue.prototype.$http = httpInstance;
+Vue.prototype.$events = window.$events;

 
 

-// Detect IE for css
-if(navigator.userAgent.indexOf('MSIE')!==-1
-    || navigator.appVersion.indexOf('Trident/') > 0
-    || navigator.userAgent.indexOf('Safari') !== -1){
-    document.body.classList.add('flexbox-support');
-}
+// Load vues and components
+import vues from "./vues/vues"
+import components from "./components"
+vues();
+components();
\ No newline at end of file