Update Ldap.php

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

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index ace0dcdd2642868430c55fd0af8b32e395c79707..9aa5dff527adcf04298e80dc28003f004080448f 100644 (file)
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -38,13 +38,17 @@ class EventManager {
         this.listeners[eventName].push(callback);
         return this;
     }
-};
-window.Events = new EventManager();
+}
 
+window.Events = new EventManager();
 
-var services = require('./services')(ngApp, window.Events);
-var directives = require('./directives')(ngApp, window.Events);
-var controllers = require('./controllers')(ngApp, window.Events);
+// Load in angular specific items
+import Services from './services';
+import Directives from './directives';
+import Controllers from './controllers';
+Services(ngApp, window.Events);
+Directives(ngApp, window.Events);
+Controllers(ngApp, window.Events);
 
 //Global jQuery Config & Extensions
 
@@ -134,17 +138,24 @@ $(function () {
     $('.popup-close').click(function() {
         $(this).closest('.overlay').fadeOut(240);
     });
-
     $('.overlay').click(function(event) {
         if (!$(event.target).hasClass('overlay')) return;
         $(this).fadeOut(240);
     });
 
+    // Prevent markdown display link click redirect
     $('.markdown-display').on('click', 'a', function(event) {
         event.preventDefault();
         window.open($(this).attr('href'));
     });
 
+    // Detect IE for css
+    if(navigator.userAgent.indexOf('MSIE')!==-1
+        || navigator.appVersion.indexOf('Trident/') > 0
+        || navigator.userAgent.indexOf('Safari') !== -1){
+        $('body').addClass('flexbox-support');
+    }
+
 });
 
 // Page specific items