Skip to content

Commit 5d13312

Browse files
committed
Small fixes
git-svn-id: https://subversion.gsi.de/dabc/trunk/plugins/root/js@3059 bcbf6573-9a26-0410-9ebc-ce4ab7aade96
1 parent 84b7102 commit 5d13312

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

files/draw.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
}
4141

4242
var obj = GetCachedObject();
43-
43+
4444
if (typeof obj != 'object') {
4545
get_function();
4646
} else

scripts/JSRootCore.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@
3030
JSROOT.browser = {};
3131

3232
JSROOT.browser.isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0;
33-
// Opera 8.0+ (UA detection to detect Blink/v8-powered Opera)
34-
JSROOT.browser.isFirefox = typeof InstallTrigger !== 'undefined'; // Firefox 1.0+
33+
JSROOT.browser.isFirefox = typeof InstallTrigger !== 'undefined';
3534
JSROOT.browser.isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
36-
// At least Safari 3+: "[object HTMLElementConstructor]"
37-
JSROOT.browser.isChrome = !!window.chrome && !JSROOT.browser.isOpera; // Chrome 1+
38-
JSROOT.browser.isIE = /*@cc_on!@*/false || !!document.documentMode; // At least IE6
35+
JSROOT.browser.isChrome = !!window.chrome && !JSROOT.browser.isOpera;
36+
JSROOT.browser.isIE = false || !!document.documentMode;
3937
JSROOT.browser.isWebKit = JSROOT.browser.isChrome || JSROOT.browser.isSafari;
4038

4139
JSROOT.function_list = []; // do we really need it here?

scripts/JSRootPainter.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6234,8 +6234,8 @@
62346234

62356235
var max_len = 0, mul = 1.4;
62366236
for (var j = 0; j < nlines; ++j) {
6237-
var line = JSROOT.Painter.translateLaTeX(pave.fPrimitives.arr[j]['fLabel']);
6238-
var lw = tpos_x + font.stringWidth(svg, line);
6237+
var label = JSROOT.Painter.translateLaTeX(pave.fPrimitives.arr[j]['fLabel']);
6238+
var lw = tpos_x + font.stringWidth(svg, label);
62396239
if (lw > max_len) max_len = lw;
62406240
}
62416241
if (max_len > w) {
@@ -6255,7 +6255,7 @@
62556255
var leg = pave.fPrimitives.arr[i];
62566256
var lopt = leg['fOption'].toLowerCase();
62576257

6258-
var string = leg['fLabel'];
6258+
var label = JSROOT.Painter.translateLaTeX(leg['fLabel']);
62596259

62606260
var pos_y = ((i + 1) * (font.size * mul)) - (font.size / 3);
62616261
var tpos_y = (i + 1) * (font.size * mul);
@@ -6286,7 +6286,7 @@
62866286
.attr("y", tpos_y)
62876287
.call(font.func)
62886288
.attr("fill", tcolor)
6289-
.text(string);
6289+
.text(label);
62906290

62916291
// Draw fill pattern (in a box)
62926292
if (lopt.indexOf('f') != -1) {

0 commit comments

Comments
 (0)