[WebUI] Load modules dynamically

1 files changed, 7 insertions, 9 deletions

diff --git a/interface/js/main.js b/interface/js/main.js
index 3b0b8de15..d57871b87 100644
--- a/interface/js/main.js
+++ b/interface/js/main.js
@@ -22,8 +22,9 @@ requirejs.config({
     shim: {
         app: {deps:["jquery"]},
         codejar: {exports: "CodeJar", deps:["linenumbers"]},
-        bootstrap: {exports:"bootstrap"},
-        d3evolution: {exports:"D3Evolution", deps:["d3", "jquery"]},
+        bootstrap: {exports:"bootstrap", deps:["jquery"]},  // Popovers require jQuery
+        d3: {exports:"d3"},
+        d3evolution: {exports:"D3Evolution", deps:["d3.global", "jquery"]},
         d3pie: {exports:"D3Pie", deps:["d3.global", "jquery"]},
         fontawesome: {exports: "FontAwesome", deps:["fontawesome_solid"]},
         footable: {deps:["bootstrap", "jquery"]},
@@ -61,10 +62,7 @@ requirejs.onError = function (e) {
 };
 
 // Load main UI
-require(["app/rspamd", "fontawesome"],
-    function (rspamd) {
-        "use strict";
-        rspamd.setup();
-        rspamd.connect();
-    }
-);
+require(["app/rspamd"], (rspamd) => {
+    "use strict";
+    rspamd.connect()
+});