Skip to content

Commit 6b9ef9f

Browse files
committed
Merge branch 'fix-renderables-labels'
Conflicts: build/MathBox-core.min.js
2 parents c0dfe96 + 19bcb4b commit 6b9ef9f

File tree

7 files changed

+365
-365
lines changed

7 files changed

+365
-365
lines changed

build/MathBox-bundle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46954,7 +46954,7 @@ MathBox.Renderable.Labels.prototype = _.extend(new MathBox.Renderable(null), {
4695446954
if (text === undefined) text = '';
4695546955

4695646956
// Try to cast to number and round to n decimals
46957-
if (+text == text) {
46957+
if (decimals !== undefined && +text == text) {
4695846958
var x = +text;
4695946959
if (x != 0) {
4696046960
var s = x < 0 ? -1 : 1;

build/MathBox-bundle.min.js

+359-359
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/MathBox-core.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4264,7 +4264,7 @@ MathBox.Renderable.Labels.prototype = _.extend(new MathBox.Renderable(null), {
42644264
if (text === undefined) text = '';
42654265

42664266
// Try to cast to number and round to n decimals
4267-
if (+text == text) {
4267+
if (decimals !== undefined && +text == text) {
42684268
var x = +text;
42694269
if (x != 0) {
42704270
var s = x < 0 ? -1 : 1;

build/MathBox-core.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/MathBox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7326,7 +7326,7 @@ MathBox.Renderable.Labels.prototype = _.extend(new MathBox.Renderable(null), {
73267326
if (text === undefined) text = '';
73277327

73287328
// Try to cast to number and round to n decimals
7329-
if (+text == text) {
7329+
if (decimals !== undefined && +text == text) {
73307330
var x = +text;
73317331
if (x != 0) {
73327332
var s = x < 0 ? -1 : 1;

build/MathBox.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderables/Labels.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ MathBox.Renderable.Labels.prototype = _.extend(new MathBox.Renderable(null), {
100100
if (text === undefined) text = '';
101101

102102
// Try to cast to number and round to n decimals
103-
if (+text == text) {
103+
if (decimals !== undefined && +text == text) {
104104
var x = +text;
105105
if (x != 0) {
106106
var s = x < 0 ? -1 : 1;

0 commit comments

Comments
 (0)