Resolved conflicts

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

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index 3a288f791d8320763cddc48503de72fedcc265c4..966adb75d9f6b37b66e6df2bdc8315c3df33becd 100644 (file)
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -1,4 +1,5 @@
 "use strict";
+require("babel-polyfill");
 
 // Url retrieval function
 window.baseUrl = function(path) {
@@ -8,6 +9,31 @@ window.baseUrl = function(path) {
     return basePath + '/' + path;
 };
 
+// Global Event System
+class EventManager {
+    constructor() {
+        this.listeners = {};
+    }
+
+    emit(eventName, 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();
+
 const Vue = require("vue");
 const axios = require("axios");
 
@@ -17,10 +43,17 @@ let axiosInstance = axios.create({
         '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;
-
-require("./vues/vues");
+Vue.prototype.$events = window.Events;
 
 
 // AngularJS - Create application and load components
@@ -38,37 +71,13 @@ const Translations = require("./translations");
 let translator = new Translations(window.translations);
 window.trans = translator.get.bind(translator);
 
-// Global Event System
-class EventManager {
-    constructor() {
-        this.listeners = {};
-    }
 
-    emit(eventName, 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();
-Vue.prototype.$events = window.Events;
+require("./vues/vues");
+require("./components");
 
 // Load in angular specific items
-const Services = require('./services');
 const Directives = require('./directives');
 const Controllers = require('./controllers');
-Services(ngApp, window.Events);
 Directives(ngApp, window.Events);
 Controllers(ngApp, window.Events);
 
@@ -153,10 +162,10 @@ $('[data-action="expand-entity-list-details"]').click(function() {
     $('.entity-list.compact').find('p').not('.empty-text').slideToggle(240);
 });
 
-// Toggle thumbnails
+// Toggle thumbnail::hide image and reduce grid size
 $(document).ready(function(){
    $('[data-action="expand-thumbnail"]').click(function(){
-     $('.galleryItem').toggleClass("collapse").find('img').slideToggle(50);
+     $('.gallery-item').toggleClass("collapse").find('img').slideToggle(50);
    });
 });
 
@@ -173,7 +182,7 @@ $('.overlay').click(function(event) {
 if(navigator.userAgent.indexOf('MSIE')!==-1
     || navigator.appVersion.indexOf('Trident/') > 0
     || navigator.userAgent.indexOf('Safari') !== -1){
-    $('body').addClass('flexbox-support');
+    document.body.classList.add('flexbox-support');
 }
 
 // Page specific items