Skip to content

Commit 6337010

Browse files
committed
Prepare 7.10.1
1 parent 59c6d27 commit 6337010

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

build/jsroot.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// https://root.cern/js/ v7.10.0
1+
// https://root.cern/js/ v7.10.1
22
(function (global, factory) {
33
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
44
typeof define === 'function' && define.amd ? define(['exports'], factory) :
@@ -10,11 +10,11 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
1010

1111
/** @summary version id
1212
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
13-
const version_id = '7.10.0',
13+
const version_id = '7.10.1',
1414

1515
/** @summary version date
1616
* @desc Release date in format day/month/year like '14/04/2022' */
17-
version_date = '27/10/2025',
17+
version_date = '26/11/2025',
1818

1919
/** @summary version id and date
2020
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -81558,7 +81558,7 @@ class TAxisPainter extends ObjectPainter {
8155881558

8155981559
/** @summary Draw axis labels
8156081560
* @return {Promise} with array label size and max width */
81561-
async drawLabels(axis_g, axis, w, h, handle, side, labelsFont, labeloffset, tickSize, ticksPlusMinus, max_text_width, frame_ygap) {
81561+
async drawLabels(axis_g, axis, w, h, handle, labelsside, labelsFont, labeloffset, tickSize, ticksPlusMinus, max_text_width, frame_ygap) {
8156281562
const center_lbls = this.isCenteredLabels(),
8156381563
label_g = [axis_g.append('svg:g').attr('class', 'axis_labels')],
8156481564
lbl_pos = handle.lbl_pos || handle.major,
@@ -81630,13 +81630,8 @@ class TAxisPainter extends ObjectPainter {
8163081630
}
8163181631
}
8163281632

81633-
let pr = Promise.resolve();
81634-
81635-
for (let lcnt = 0; lcnt < label_g.length; ++lcnt) {
81636-
if (lcnt > 0)
81637-
side = -side;
81638-
81639-
pr = pr.then(() => this.startTextDrawingAsync(labelsFont, 'font', label_g[lcnt])).then(() => {
81633+
const draw_labels = (lcnt, side) => {
81634+
return this.startTextDrawingAsync(labelsFont, 'font', label_g[lcnt]).then(() => {
8164081635
let lastpos = 0;
8164181636
const fix_coord = this.vertical ? -labeloffset * side : labeloffset * side + ticksPlusMinus * tickSize;
8164281637

@@ -81682,7 +81677,8 @@ class TAxisPainter extends ObjectPainter {
8168281677
if (this.vertical) {
8168381678
arg.x = fix_coord;
8168481679
arg.y = pos;
81685-
arg.align = rotate_lbls ? (this.optionLeft || this.reverseAlign ? 23 : 21) : (this.optionLeft || this.reverseAlign ? 12 : 32);
81680+
const flag = this.optionLeft || this.reverseAlign || (side < 0);
81681+
arg.align = rotate_lbls ? (flag ? 23 : 21) : (flag ? 12 : 32);
8168681682
if (this.cutLabels()) {
8168781683
const gap = labelsFont.size * (rotate_lbls ? 1.5 : 0.6);
8168881684
if ((pos < gap) || (pos > h - gap))
@@ -81752,14 +81748,16 @@ class TAxisPainter extends ObjectPainter {
8175281748
});
8175381749
}
8175481750

81755-
if ((lcnt > 1) && applied_scale)
81751+
if ((lcnt > 0) && applied_scale)
8175681752
this.scaleTextDrawing(applied_scale, label_g[lcnt]);
8175781753

8175881754
return this.finishTextDrawing(label_g[lcnt], true);
8175981755
});
81760-
}
81756+
};
8176181757

81762-
return pr.then(() => {
81758+
return draw_labels(0, labelsside).then(() => {
81759+
return label_g.length < 2 ? true : draw_labels(1, -labelsside);
81760+
}).then(() => {
8176381761
this._maxlbllen = maxtextlen; // for internal use in palette painter
8176481762

8176581763
if (lbl_tilt) {
@@ -93928,7 +93926,7 @@ class FunctionsHandler {
9392893926
#painter; // object painter to which functions belongs
9392993927
#pad_painter; // pad painter
9393093928

93931-
constructor(painter, pp, funcs, statpainter) {
93929+
constructor(painter, pp, funcs, statpainter, update_statpainter) {
9393293930
this.#painter = painter;
9393393931
this.#pad_painter = pp;
9393493932

@@ -93987,6 +93985,8 @@ class FunctionsHandler {
9398793985
const indx = painters.indexOf(statpainter);
9398893986
if (indx >= 0)
9398993987
painters.splice(indx, 1);
93988+
if (update_statpainter && (update_painters.indexOf(statpainter) < 0))
93989+
update_painters.push(statpainter);
9399093990
}
9399193991

9399293992
// remove all function which are not found in new list of functions
@@ -94366,7 +94366,7 @@ class THistPainter extends ObjectPainter {
9436694366
histo.fBins = obj.fBins;
9436794367

9436894368
// remove old functions, update existing, prepare to draw new one
94369-
this.#funcs_handler = new FunctionsHandler(this, pp, obj.fFunctions, statpainter);
94369+
this.#funcs_handler = new FunctionsHandler(this, pp, obj.fFunctions, statpainter, this.create_stats);
9437094370

9437194371
const changed_opt = (histo.fOption !== obj.fOption);
9437294372
histo.fOption = obj.fOption;
@@ -124380,7 +124380,7 @@ class TFile {
124380124380
return send_new_request(true);
124381124381
}
124382124382

124383-
if ((file.fMaxRanges === 1) || !first)
124383+
if ((file.fMaxRanges === 1) || first)
124384124384
return rejectFunc(Error('Server returns normal response when multipart was requested, disable multirange support'));
124385124385

124386124386
file.fMaxRanges = 1;

changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# JSROOT changelog
22

3-
## Changes in 7.10.x
3+
## Changes in 7.10.1
44
1. Fix - proper paint axis labels on both sides when pad.fTickx/y = 2
55
2. Fix - recover io after bad http response
66

modules/core.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
/** @summary version id
44
* @desc For the JSROOT release the string in format 'major.minor.patch' like '7.0.0' */
5-
const version_id = '7.10.x',
5+
const version_id = '7.10.1',
66

77
/** @summary version date
88
* @desc Release date in format day/month/year like '14/04/2022' */
9-
version_date = '18/11/2025',
9+
version_date = '26/11/2025',
1010

1111
/** @summary version id and date
1212
* @desc Produced by concatenation of {@link version_id} and {@link version_date}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)