Revert some changes to HttpFetchException

[bookstack] / resources / js / app.js

diff --git a/resources/js/app.js b/resources/js/app.js
index e49bf5e955bd040d1b68114fb17e8b307a3a024e..5b822e9009e26f58f4695215c4570c9a86bd59de 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,34 +1,37 @@
+import * as events from './services/events';
+import * as httpInstance from './services/http';
+import Translations from './services/translations';
+
+import * as components from './services/components';
+import * as componentMap from './components';
+

 // Url retrieval function
 // Url retrieval function

-window.baseUrl = function(path) {
+window.baseUrl = function baseUrl(path) {
+    let targetPath = path;

     let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');
     let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');

-    if (basePath[basePath.length-1] === '/') basePath = basePath.slice(0, basePath.length-1);
-    if (path[0] === '/') path = path.slice(1);
-    return basePath + '/' + path;
+    if (basePath[basePath.length - 1] === '/') basePath = basePath.slice(0, basePath.length - 1);
+    if (targetPath[0] === '/') targetPath = targetPath.slice(1);
+    return `${basePath}/${targetPath}`;

 };
 
 };
 

-window.importVersioned = function(moduleName) {
+window.importVersioned = function importVersioned(moduleName) {

     const version = document.querySelector('link[href*="/dist/styles.css?version="]').href.split('?version=').pop();
     const importPath = window.baseUrl(`dist/${moduleName}.js?version=${version}`);
     return import(importPath);
 };
 
 // Set events and http services on window
     const version = document.querySelector('link[href*="/dist/styles.css?version="]').href.split('?version=').pop();
     const importPath = window.baseUrl(`dist/${moduleName}.js?version=${version}`);
     return import(importPath);
 };
 
 // Set events and http services on window

-import events from "./services/events"
-import httpInstance from "./services/http"

 window.$http = httpInstance;
 window.$events = events;
 
 // Translation setup
 window.$http = httpInstance;
 window.$events = events;
 
 // 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"
+// Creates a global function with name 'trans' to be used in the same way as the Laravel translation system

 const translator = new Translations();
 window.trans = translator.get.bind(translator);
 window.trans_choice = translator.getPlural.bind(translator);
 window.trans_plural = translator.parsePlural.bind(translator);
 
 const translator = new Translations();
 window.trans = translator.get.bind(translator);
 window.trans_choice = translator.getPlural.bind(translator);
 window.trans_plural = translator.parsePlural.bind(translator);
 

-// Load Components
-import * as components from "./services/components"
-import * as componentMap from "./components";
+// Load & initialise components

 components.register(componentMap);
 window.$components = components;
 components.init();
 components.register(componentMap);
 window.$components = components;
 components.init();