Fix - correctly use preloaded d3.js in notebooks/require.js environment

Author: linev

changes.md

@@ -1,5 +1,9 @@
 # JSROOT changelog
 
+## Changes in 5.3.5
+1. Fix - correctly use preloaded d3.js in notebooks/require.js environment
+
+
 ## Changes in 5.3.4
 1. Fix - several problem in TLatex preprocessing for MathJax.js
 2. Fix - use "E" draw options for THStack only when no any other specified

scripts/JSRootCore.js

@@ -967,6 +967,7 @@
 
       var ext = jsroot.source_min ? ".min" : "",
           need_jquery = false,
+          use_require = (typeof define === "function") && define.amd,
           use_bower = jsroot.bower_dir!==null,
           mainfiles = "",
           extrafiles = "", // scripts for direct loading
@@ -993,23 +994,9 @@
          }
 
       if ((kind.indexOf('2d;')>=0) || (kind.indexOf("3d;")>=0) || (kind.indexOf("geom;")>=0) || (kind.indexOf("openui5;")>=0)) {
-         if (jsroot._test_d3_ === undefined) {
-            if ((typeof d3 == 'object') && d3.version && (d3.version[0]==="4"))  {
-               jsroot.console('Reuse existing d3.js ' + d3.version + ", expected 4.4.4", debugout);
-               jsroot._test_d3_ = 4;
-            } else
-            if ((typeof d3 == 'object') && d3.version && (d3.version[0]==="3")) {
-               jsroot.console("d3 version is " + d3.version + ", try to adjust");
-               d3.timeFormat = d3.time.format;
-               d3.scaleTime = d3.time.scale;
-               d3.scaleLog = d3.scale.log;
-               d3.scaleLinear = d3.scale.linear;
-
-               jsroot._test_d3_ = 3;
-            } else {
-               mainfiles += use_bower ? '###d3/d3.min.js;' : '&&&scripts/d3.min.js;';
-               jsroot._test_d3_ = 4;
-            }
+          if (!use_require && (typeof d3 != 'object') && (jsroot._test_d3_ === undefined)) {
+             mainfiles += use_bower ? '###d3/d3.min.js;' : '&&&scripts/d3.min.js;';
+             jsroot._test_d3_ = null;
          }
          if (jsroot.sources.indexOf("2d") < 0) {
             modules.push('JSRootPainter');

scripts/JSRootPainter.js

@@ -32,8 +32,24 @@
    if ( typeof define === "function" && define.amd )
       JSROOT.loadScript('$$$style/JSRootPainter.css');
 
+   if (!JSROOT._test_d3_) {
+      if ((typeof d3 == 'object') && d3.version && (d3.version[0]==="4"))  {
+         if (d3.version !== '4.4.4')
+            console.log('Reuse existing d3.js ' + d3.version + ", expected 4.4.4");
+         JSROOT._test_d3_ = 4;
+      } else if ((typeof d3 == 'object') && d3.version && (d3.version[0]==="3")) {
+         console.log("Older d3.js version " + d3.version + " found, try to adjust");
+         d3.timeFormat = d3.time.format;
+         d3.scaleTime = d3.time.scale;
+         d3.scaleLog = d3.scale.log;
+         d3.scaleLinear = d3.scale.linear;
+         JSROOT._test_d3_ = 3;
+      } else {
+         console.error('Fail to identify d3.js version '  + (d3 ? d3.version : "???"));
+      }
+   }
    // list of user painters, called with arguments func(vis, obj, opt)
-   JSROOT.DrawFuncs = {lst:[], cache:{}};
+   JSROOT.DrawFuncs = { lst:[], cache:{} };
 
    // add draw function for the class
    // List of supported draw options could be provided, separated  with ';'