#47 - Fixes the issues with the test case.

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

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index 94462ed6483de9ba64f2035c33facd642dda5308..dc6802e12ba6646be4099f759773f2368e2c5ffe 100644 (file)
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -1,12 +1,5 @@
 "use strict";
 
 "use strict";
 

-// AngularJS - Create application and load components
-import angular from "angular";
-import "angular-resource";
-import "angular-animate";
-import "angular-sanitize";
-import "angular-ui-sortable";
-

 // Url retrieval function
 window.baseUrl = function(path) {
     let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');
 // Url retrieval function
 window.baseUrl = function(path) {
     let basePath = document.querySelector('meta[name="base-url"]').getAttribute('content');


@@ -15,11 +8,33 @@ window.baseUrl = function(path) {
     return basePath + '/' + path;
 };
 
     return basePath + '/' + path;
 };
 

+const Vue = require("vue");
+const axios = require("axios");
+
+let axiosInstance = axios.create({
+    headers: {
+        'X-CSRF-TOKEN': document.querySelector('meta[name=token]').getAttribute('content'),
+        'baseURL': window.baseUrl('')
+    }
+});
+
+Vue.prototype.$http = axiosInstance;
+
+require("./vues/vues");
+
+
+// AngularJS - Create application and load components
+const angular = require("angular");
+require("angular-resource");
+require("angular-animate");
+require("angular-sanitize");
+require("angular-ui-sortable");
+

 let ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']);
 
 // Translation setup
 // Creates a global function with name 'trans' to be used in the same way as Laravel's translation system
 let ngApp = angular.module('bookStack', ['ngResource', 'ngAnimate', 'ngSanitize', 'ui.sortable']);
 
 // Translation setup
 // Creates a global function with name 'trans' to be used in the same way as Laravel's translation system

-import Translations from "./translations"
+const Translations = require("./translations");

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


@@ -47,11 +62,12 @@ class EventManager {
 }
 
 window.Events = new EventManager();
 }
 
 window.Events = new EventManager();

+Vue.prototype.$events = window.Events;

 
 // Load in angular specific items
 
 // Load in angular specific items

-import Services from './services';
-import Directives from './directives';
-import Controllers from './controllers';
+const Services = require('./services');
+const Directives = require('./directives');
+const Controllers = require('./controllers');

 Services(ngApp, window.Events);
 Directives(ngApp, window.Events);
 Controllers(ngApp, window.Events);
 Services(ngApp, window.Events);
 Directives(ngApp, window.Events);
 Controllers(ngApp, window.Events);


@@ -61,10 +77,9 @@ Controllers(ngApp, window.Events);
 // Smooth scrolling
 jQuery.fn.smoothScrollTo = function () {
     if (this.length === 0) return;
 // Smooth scrolling
 jQuery.fn.smoothScrollTo = function () {
     if (this.length === 0) return;

-    let scrollElem = document.documentElement.scrollTop === 0 ?  document.body : document.documentElement;
-    $(scrollElem).animate({
+    $('html, body').animate({

         scrollTop: this.offset().top - 60 // Adjust to change final scroll position top margin
         scrollTop: this.offset().top - 60 // Adjust to change final scroll position top margin

-    }, 800); // Adjust to change animations speed (ms)
+    }, 300); // Adjust to change animations speed (ms)

     return this;
 };
 
     return this;
 };
 


@@ -155,4 +170,4 @@ if(navigator.userAgent.indexOf('MSIE')!==-1
 }
 
 // Page specific items
 }
 
 // Page specific items

-import "./pages/page-show";
+require("./pages/page-show");