X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/41f56e659dfb82b2a8750dcfb62ea2e51c9a9ec6..refs/pull/651/head:/resources/assets/js/global.js diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index b02f6caf3..352616c5a 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -58,16 +58,6 @@ window.$http = axiosInstance; Vue.prototype.$http = axiosInstance; Vue.prototype.$events = window.$events; - -// 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 const Translations = require("./translations"); @@ -79,11 +69,6 @@ window.trans_choice = translator.getPlural.bind(translator); require("./vues/vues"); require("./components"); -// Load in angular specific items -const Directives = require('./directives'); -const Controllers = require('./controllers'); -Directives(ngApp, window.$events); -Controllers(ngApp, window.$events); //Global jQuery Config & Extensions @@ -93,7 +78,8 @@ Controllers(ngApp, window.$events); */ window.scrollToElement = function(element) { if (!element) return; - let top = element.getBoundingClientRect().top + document.body.scrollTop; + 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);