Adds overflow:auto to popup content to allow it to scroll in lower res.

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

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index b02f6caf3fe3668ba819960550250dafa27095d4..352616c5a2e00c73a7b88e521f84e9eca414b76c 100644 (file)
--- 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);