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

Fixed CM.Disp.Beautify

Browse Source
This commit is contained in:
Daniel van Noord
2020-12-04 21:14:17 +01:00
parent 343327a1b5
commit 02b31c8932
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CookieMonster.js
View File

@@ -1218,7 +1218,7 @@ CM.Disp.Beautify = function(num, frac, forced) {
if (num == "0") { if (num == "0") {
return num return num
} }
else if (-1 < timesTenToPowerThree < 2) { else if (-1 < timesTenToPowerThree && timesTenToPowerThree < 2) {
answer = Math.round(num * 100) / 100; answer = Math.round(num * 100) / 100;
} }
else if (CM.Config.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8 else if (CM.Config.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8
@@ -1267,7 +1267,7 @@ CM.Disp.Beautify = function(num, frac, forced) {
answer = CM.Backup.Beautify(num, frac); answer = CM.Backup.Beautify(num, frac);
} }
if (negative) answer = '-' + answer; if (negative) answer = '-' + answer;
return answer; return answer.toString();
} }
else if (num == Infinity) { else if (num == Infinity) {
return "Infinity"; return "Infinity";

4
src/Disp.js
View File

@@ -336,7 +336,7 @@ CM.Disp.Beautify = function(num, frac, forced) {
if (num == "0") { if (num == "0") {
return num return num
} }
else if (-1 < timesTenToPowerThree < 2) { else if (-1 < timesTenToPowerThree && timesTenToPowerThree < 2) {
answer = Math.round(num * 100) / 100; answer = Math.round(num * 100) / 100;
} }
else if (CM.Config.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8 else if (CM.Config.Scale == 3 && !forced || forced == 3) { // Scientific notation, 123456789 => 1.235E+8
@@ -385,7 +385,7 @@ CM.Disp.Beautify = function(num, frac, forced) {
answer = CM.Backup.Beautify(num, frac); answer = CM.Backup.Beautify(num, frac);
} }
if (negative) answer = '-' + answer; if (negative) answer = '-' + answer;
return answer; return answer.toString();
} }
else if (num == Infinity) { else if (num == Infinity) {
return "Infinity"; return "Infinity";