Skip to content

[jsroot] 7.11.x from 23/07/2026 [6.40] #22902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linev wants to merge 1 commit into
base: v6-40-00-patches
Choose a base branch
from
Open

[jsroot] 7.11.x from 23/07/2026 [6.40] #22902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 33 additions & 14 deletions js/build/jsroot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://root.cern/js/ v7.11.0
// https://root.cern/js/ v7.11.1
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) :
Expand All @@ -10,11 +10,11 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS

/** @summary version id
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
const version_id = '7.11.0',
const version_id = '7.11.x',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '5/05/2026',
version_date = '23/07/2026',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down Expand Up @@ -81017,6 +81017,13 @@ class JSRootMenu {

/** @summary Add menu header - must be first entry */
header(name, title) {
if (name.length > 25) {
if (!title)
title = name;
else if (isStr(title) && title.indexOf('https://') === 0)
title = name + title;
name = name.slice(0, 22) + '...';
}
this.add(sHeader + name, undefined, undefined, title);
}

Expand Down Expand Up @@ -93165,9 +93172,10 @@ class TCanvasPainter extends TPadPainter {

this.forEachPainterInPad(pp => {
const pad = pp.getRootPad(true);
if (pp.getNumPainters() && pad?.fPrimitives && !pad.fPrimitives.arr.length) {
if (pp.getNumPainters() && pad && !pad.fPrimitives?.arr.length) {
prims.push(pad, pad.fPrimitives); // remember old value
// create list of primitives when missing
prims.push(pad.fPrimitives);
pad.fPrimitives = create$1(clTList);
pp.forEachPainterInPad(p => {
// ignore all secondary painters
if (p.isSecondary())
Expand Down Expand Up @@ -93226,7 +93234,8 @@ class TCanvasPainter extends TPadPainter {
e.hist.fMaximum = e.max;
});

prims.forEach(lst => lst.Clear());
for (let k = 0; k < prims.length; k += 2)
prims[k].fPrimitives = prims[k + 1];

return res;
}
Expand Down Expand Up @@ -104602,10 +104611,10 @@ function getTF1Value(func, x, skip_eval = undefined) {

if (func.evalPar && !iserr) {
try {
return func.evalPar(x);
const res = func.evalPar(x);
if (Number.isFinite(res))
return res;
} catch {
/* eslint-disable-next-line no-useless-assignment */
iserr = true;
}
}

Expand Down Expand Up @@ -170607,7 +170616,7 @@ function readStyleFromURL(url) {

const b = d.get('batch');
if (b !== undefined) {
setBatchMode(d !== 'off');
setBatchMode(b !== 'off');
if (b === 'png')
internals.batch_png = true;
}
Expand Down Expand Up @@ -175394,12 +175403,14 @@ class TF1Painter extends TH1Painter$2 {
let y = 0;
try {
y = tf1.evalPar(x);
if (!Number.isFinite(y))
iserror = true;
} catch {
iserror = true;
}

if (!iserror)
hist.setBinContent(n + 1, Number.isFinite(y) ? y : 0);
hist.setBinContent(n + 1, y);
}

if (iserror)
Expand Down Expand Up @@ -177187,12 +177198,14 @@ class TF2Painter extends TH2Painter {

try {
z = func.evalPar(x, y);
if (!Number.isFinite(z))
iserror = true;
} catch {
iserror = true;
}

if (!iserror)
hist.setBinContent(hist.getBin(i + 1, j + 1), Number.isFinite(z) ? z : 0);
hist.setBinContent(hist.getBin(i + 1, j + 1), z);
}
}

Expand Down Expand Up @@ -177552,10 +177565,16 @@ class TF3Painter extends TH2Painter {
let z = 0;

try {
for (let k = 0; k < npz; ++k)
for (let k = 0; k < npz; ++k) {
arrv[k] = func.evalPar(x, y, arrz[k]);
if (!Number.isFinite(arrv[k])) {
iserror = true;
break;
}
}

z = findZValue(arrz, arrv);
if (!iserror)
z = findZValue(arrz, arrv);
} catch {
iserror = true;
}
Expand Down
5 changes: 5 additions & 0 deletions js/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# JSROOT changelog

## Changes in 7.11.x
1. Fix - prevent very long header in context menu
2. Fix - JSON production for TWebCanvas
1. Fix - check evaluated value of TF1


## Changes in 7.11.0
1. Implement new data types in `RNtuple`
Expand Down
6 changes: 3 additions & 3 deletions js/modules/base/func.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ function getTF1Value(func, x, skip_eval = undefined) {

if (func.evalPar && !iserr) {
try {
return func.evalPar(x);
const res = func.evalPar(x);
if (Number.isFinite(res))
return res;
} catch {
/* eslint-disable-next-line no-useless-assignment */
iserr = true;
}
}

Expand Down
4 changes: 2 additions & 2 deletions js/modules/core.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

/** @summary version id
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
const version_id = '7.11.0',
const version_id = '7.11.x',

/** @summary version date
* @desc Release date in format day/month/year like '14/04/2022' */
version_date = '5/05/2026',
version_date = '23/07/2026',

/** @summary version id and date
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
Expand Down
11 changes: 7 additions & 4 deletions js/modules/gpad/TCanvasPainter.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BIT, settings, gStyle, internals, browser, create, parse, toJSON, loadScript, isFunc, isStr, clTCanvas } from '../core.mjs';
import { BIT, settings, gStyle, internals, browser, create, parse,
toJSON, loadScript, isFunc, isStr, clTCanvas, clTList } from '../core.mjs';
import { select as d3_select } from '../d3.mjs';
import { closeCurrentWindow, showProgress, loadOpenui5, ToolbarIcons, getColorExec } from '../gui/utils.mjs';
import { GridDisplay, getHPainter } from '../gui/display.mjs';
Expand Down Expand Up @@ -856,9 +857,10 @@ class TCanvasPainter extends TPadPainter {

this.forEachPainterInPad(pp => {
const pad = pp.getRootPad(true);
if (pp.getNumPainters() && pad?.fPrimitives && !pad.fPrimitives.arr.length) {
if (pp.getNumPainters() && pad && !pad.fPrimitives?.arr.length) {
prims.push(pad, pad.fPrimitives); // remember old value
// create list of primitives when missing
prims.push(pad.fPrimitives);
pad.fPrimitives = create(clTList);
pp.forEachPainterInPad(p => {
// ignore all secondary painters
if (p.isSecondary())
Expand Down Expand Up @@ -917,7 +919,8 @@ class TCanvasPainter extends TPadPainter {
e.hist.fMaximum = e.max;
});

prims.forEach(lst => lst.Clear());
for (let k = 0; k < prims.length; k += 2)
prims[k].fPrimitives = prims[k + 1];

return res;
}
Expand Down
2 changes: 1 addition & 1 deletion js/modules/gui.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function readStyleFromURL(url) {

const b = d.get('batch');
if (b !== undefined) {
setBatchMode(d !== 'off');
setBatchMode(b !== 'off');
if (b === 'png')
internals.batch_png = true;
}
Expand Down
7 changes: 7 additions & 0 deletions js/modules/gui/menu.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ class JSRootMenu {

/** @summary Add menu header - must be first entry */
header(name, title) {
if (name.length > 25) {
if (!title)
title = name;
else if (isStr(title) && title.indexOf('https://') === 0)
title = name + title;
name = name.slice(0, 22) + '...';
}
this.add(sHeader + name, undefined, undefined, title);
}

Expand Down
4 changes: 3 additions & 1 deletion js/modules/hist/TF1Painter.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,14 @@ class TF1Painter extends TH1Painter {
let y = 0;
try {
y = tf1.evalPar(x);
if (!Number.isFinite(y))
iserror = true;
} catch {
iserror = true;
}

if (!iserror)
hist.setBinContent(n + 1, Number.isFinite(y) ? y : 0);
hist.setBinContent(n + 1, y);
}

if (iserror)
Expand Down
4 changes: 3 additions & 1 deletion js/modules/hist/TF2Painter.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ class TF2Painter extends TH2Painter {

try {
z = func.evalPar(x, y);
if (!Number.isFinite(z))
iserror = true;
} catch {
iserror = true;
}

if (!iserror)
hist.setBinContent(hist.getBin(i + 1, j + 1), Number.isFinite(z) ? z : 0);
hist.setBinContent(hist.getBin(i + 1, j + 1), z);
}
}

Expand Down
12 changes: 9 additions & 3 deletions js/modules/hist/TF3Painter.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,16 @@ class TF3Painter extends TH2Painter {
let z = 0;

try {
for (let k = 0; k < npz; ++k)
for (let k = 0; k < npz; ++k) {
arrv[k] = func.evalPar(x, y, arrz[k]);

z = findZValue(arrz, arrv);
if (!Number.isFinite(arrv[k])) {
iserror = true;
break;
}
}

if (!iserror)
z = findZValue(arrz, arrv);
} catch {
iserror = true;
}
Expand Down
Loading