From 206c7ace04661c1769b456c8dc95f39e20d810b4 Mon Sep 17 00:00:00 2001
From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Sat, 23 Sep 2017 20:41:00 +0300
Subject: [WebUI] Migrate widgets to D3 v4

---
 interface/js/main.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'interface/js/main.js')

diff --git a/interface/js/main.js b/interface/js/main.js
index a403797b8..1470ccc95 100644
--- a/interface/js/main.js
+++ b/interface/js/main.js
@@ -15,18 +15,22 @@ requirejs.config({
     shim: {
         d3: {exports: 'd3'},
         bootstrap: {exports: 'bootstrap', deps: ['jquery']},
-        d3pie: {exports: 'd3pie', deps: ['d3', 'jquery']},
+        d3pie: {exports: 'd3pie', deps: ['d3.global', 'jquery']},
         d3evolution: {exports: 'D3Evolution', deps: ['d3', 'd3pie', 'jquery']},
         footable: {deps: ['bootstrap', 'jquery']}
     }
 });
 
+define("d3.global", ["d3"], function(_) {
+  d3 = _;
+});
+
 // Load main UI
 require(['domReady'],
 function(domReady) {
     domReady(function () {
-        require(['jquery', 'app/rspamd'],
-            function ($, rspamd) {
+        require(['jquery', 'd3', 'app/rspamd'],
+            function ($, d3, rspamd) {
                 rspamd.setup();
                 rspamd.connect();
             });
-- 
cgit v1.2.3