Skip to content

Commit 9a583b4

Browse files
authored
Merge pull request #5637 from plotly/simplify-ensure-number
simplify ensureNumber
2 parents 32ea3c9 + e506484 commit 9a583b4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/constants/numerical.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
* to avoid glitches: Make sure that even when you multiply it by the
1616
* number of pixels on a giant screen it still works
1717
*/
18-
FP_SAFE: Number.MAX_VALUE / 10000,
18+
FP_SAFE: Number.MAX_VALUE * 1e-4,
1919

2020
/*
2121
* conversion of date units to milliseconds

src/lib/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ var utcFormat = require('d3-time-format').utcFormat;
55
var isNumeric = require('fast-isnumeric');
66

77
var numConstants = require('../constants/numerical');
8-
var FP_SAFE = numConstants.FP_SAFE;
8+
var MAX_SAFE = numConstants.FP_SAFE;
9+
var MIN_SAFE = -MAX_SAFE;
910
var BADNUM = numConstants.BADNUM;
1011

1112
var lib = module.exports = {};
@@ -166,8 +167,7 @@ lib.cleanNumber = require('./clean_number');
166167
lib.ensureNumber = function ensureNumber(v) {
167168
if(!isNumeric(v)) return BADNUM;
168169
v = Number(v);
169-
if(v < -FP_SAFE || v > FP_SAFE) return BADNUM;
170-
return isNumeric(v) ? Number(v) : BADNUM;
170+
return (v > MAX_SAFE || v < MIN_SAFE) ? BADNUM : v;
171171
};
172172

173173
/**

0 commit comments

Comments
 (0)