Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-20 06:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3521 from taralx/patch-4

Browse Source 
MISC: update @types/numeral and fix type errors
This commit is contained in:
hydroflame 2022-04-19 22:29:56 -04:00 committed by GitHub
commit ee5a3ea52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -60,7 +60,7 @@
"@types/escodegen": "^0.0.7", "@types/escodegen": "^0.0.7",
"@types/file-saver": "^2.0.3", "@types/file-saver": "^2.0.3",
"@types/lodash": "^4.14.168", "@types/lodash": "^4.14.168",
"@types/numeral": "0.0.25", "@types/numeral": "^2.0.2",
"@types/react": "^17.0.21", "@types/react": "^17.0.21",
"@types/react-beautiful-dnd": "^13.1.2", "@types/react-beautiful-dnd": "^13.1.2",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.9",

16
src/ui/numeralFormat.ts
View File

@ -223,19 +223,21 @@ class NumeralFormatter {
const parsed = parseFloat(s); const parsed = parseFloat(s);
const selfParsed = this.parseCustomLargeNumber(s); const selfParsed = this.parseCustomLargeNumber(s);
// Check for one or more NaN values // Check for one or more NaN values
if (isNaN(parsed) && numeralValue === null && isNaN(selfParsed)) { if (isNaN(parsed) && isNaN(selfParsed)) {
// 3x NaN if (numeralValue === null) {
return NaN; // 3x NaN
} else if (isNaN(parsed) && isNaN(selfParsed)) { return NaN;
}
// 2x NaN // 2x NaN
return numeralValue; return numeralValue;
} else if (numeralValue === null && isNaN(selfParsed)) { } else if (numeralValue === null && isNaN(selfParsed)) {
// 2x NaN // 2x NaN
return parsed; return parsed;
} else if (isNaN(parsed) && numeralValue === null) {
// 2x NaN
return selfParsed;
} else if (isNaN(parsed)) { } else if (isNaN(parsed)) {
if (numeralValue === null) {
// 2x NaN
return selfParsed;
}
// 1x NaN // 1x NaN
return this.largestAbsoluteNumber(numeralValue, selfParsed); return this.largestAbsoluteNumber(numeralValue, selfParsed);
} else if (numeralValue === null) { } else if (numeralValue === null) {