Skip to content

Commit 95824e7

Browse files
committed
Use JSROOT.require to load script for draw function
Such script may use JSROOT.define and therefore need to be handled so
1 parent 531cdcd commit 95824e7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

scripts/JSRoot.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104

105105
/** @summary JSROOT version date
106106
* @desc Release date in format day/month/year like "19/11/2021"*/
107-
JSROOT.version_date = "3/01/2022";
107+
JSROOT.version_date = "17/01/2022";
108108

109109
/** @summary JSROOT version id and date
110110
* @desc Produced by concatenation of {@link JSROOT.version_id} and {@link JSROOT.version_date}

scripts/JSRoot.painter.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3990,13 +3990,13 @@ JSROOT.define(['d3'], (d3) => {
39903990
prereq += ";v7gpad";
39913991
else if (handle.direct)
39923992
prereq += ";gpad";
3993-
let script = handle.script || "";
3994-
if (script) script = script.split(";");
3993+
if (handle.script)
3994+
prereq += ";" + handle.script;
39953995

3996-
if (!prereq && !script)
3996+
if (!prereq)
39973997
return Promise.reject(Error(`Prerequicities to load ${funcname} are not specified`));
39983998

3999-
return JSROOT.require(prereq).then(() => JSROOT.loadScript(script)).then(() => {
3999+
return JSROOT.require(prereq).then(() => {
40004000
let func = JSROOT.findFunction(funcname);
40014001
if (!func)
40024002
return Promise.reject(Error(`Fail to find function ${funcname} after loading ${prereq}`));

0 commit comments

Comments
 (0)