david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed decimal notation #500

Browse Source
This commit is contained in:
Daniel van Noord
2021-01-25 23:37:41 +01:00
parent 92c28b092b
commit e5b24b393e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CookieMonster.js
View File

@@ -1379,8 +1379,11 @@ CM.Disp.Beautify = function(num, floats, forced) {
return num.toString() return num.toString()
} }
else if (0.001 < num && num < CM.Options.ScaleCutoff) { else if (0.001 < num && num < CM.Options.ScaleCutoff) {
answer = num.toFixed(0); answer = num.toFixed(2);
if (CM.Options.ScaleSeparator) answer = answer.toLocaleString('nl'); if (CM.Options.ScaleSeparator) answer = answer.toLocaleString('nl');
for (let i = 0; i < 3; i++) {
if (answer[answer.length - 1] == "0" | answer[answer.length - 1] == ".") answer = answer.slice(0, -1)
}
return answer; return answer;
} }
else if (CM.Options.Scale == 4 && !forced || forced == 4) { // Scientific notation, 123456789 => 1.235E+8 else if (CM.Options.Scale == 4 && !forced || forced == 4) { // Scientific notation, 123456789 => 1.235E+8

5
src/Disp.js
View File

@@ -196,8 +196,11 @@ CM.Disp.Beautify = function(num, floats, forced) {
return num.toString() return num.toString()
} }
else if (0.001 < num && num < CM.Options.ScaleCutoff) { else if (0.001 < num && num < CM.Options.ScaleCutoff) {
answer = num.toFixed(0); answer = num.toFixed(2);
if (CM.Options.ScaleSeparator) answer = answer.toLocaleString('nl'); if (CM.Options.ScaleSeparator) answer = answer.toLocaleString('nl');
for (let i = 0; i < 3; i++) {
if (answer[answer.length - 1] == "0" | answer[answer.length - 1] == ".") answer = answer.slice(0, -1)
}
return answer; return answer;
} }
else if (CM.Options.Scale == 4 && !forced || forced == 4) { // Scientific notation, 123456789 => 1.235E+8 else if (CM.Options.Scale == 4 && !forced || forced == 4) { // Scientific notation, 123456789 => 1.235E+8