Skip to content

Commit 51a0563

Browse files
committed
lib/constants -> constants/numerical
1 parent 9ccde7e commit 51a0563

File tree

8 files changed

+10
-13
lines changed

8 files changed

+10
-13
lines changed
File renamed without changes.

src/lib/clean_number.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
var isNumeric = require('fast-isnumeric');
1313

14-
var BADNUM = require('./constants').BADNUM;
14+
var BADNUM = require('../constants/numerical').BADNUM;
1515

1616
// precompile these regex's for speed
1717
var FRONTJUNK = /^['"%,$#\s']+/;

src/lib/dates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
var d3 = require('d3');
1313
var isNumeric = require('fast-isnumeric');
14-
var BADNUM = require('./constants').BADNUM;
14+
var BADNUM = require('../constants/numerical').BADNUM;
1515
var logError = require('./loggers').error;
1616

1717
// is an object a javascript date?

src/lib/index.js

-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ lib.error = loggersModule.error;
7878

7979
lib.notifier = require('./notifier');
8080

81-
var constantsModule = require('./constants');
82-
lib.BADNUM = constantsModule.BADNUM,
83-
lib.FP_SAFE = constantsModule.FP_SAFE;
84-
8581
lib.filterUnique = require('./filter_unique');
8682

8783
lib.cleanNumber = require('./clean_number');

src/plots/cartesian/axes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Titles = require('../../components/titles');
1919
var Color = require('../../components/color');
2020
var Drawing = require('../../components/drawing');
2121

22-
var FP_SAFE = Lib.FP_SAFE;
22+
var FP_SAFE = require('../../constants/numerical').FP_SAFE;
2323

2424

2525
var axes = module.exports = {};

src/plots/cartesian/axis_autotype.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var isNumeric = require('fast-isnumeric');
1313

1414
var Lib = require('../../lib');
15+
var BADNUM = require('../../constants/numerical').BADNUM;
1516

1617
module.exports = function autoType(array) {
1718
if(moreDates(array)) return 'date';
@@ -64,7 +65,7 @@ function category(a) {
6465

6566
for(var i = 0; i < a.length; i += inc) {
6667
ai = a[Math.round(i)];
67-
if(Lib.cleanNumber(ai) !== Lib.BADNUM) curvenums++;
68+
if(Lib.cleanNumber(ai) !== BADNUM) curvenums++;
6869
else if(typeof ai === 'string' && ai !== '' && ai !== 'None') curvecats++;
6970
}
7071

src/plots/cartesian/set_convert.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ var d3 = require('d3');
1313
var isNumeric = require('fast-isnumeric');
1414

1515
var Lib = require('../../lib');
16-
var FP_SAFE = Lib.FP_SAFE;
17-
var BADNUM = Lib.BADNUM;
16+
var numConstants = require('../../constants/numerical');
17+
var FP_SAFE = numConstants.FP_SAFE;
18+
var BADNUM = numConstants.BADNUM;
1819

1920
var constants = require('./constants');
2021
var axisIds = require('./axis_ids');

src/traces/scatter/line_points.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
'use strict';
1111

12-
var Axes = require('../../plots/cartesian/axes');
12+
var BADNUM = require('../../constants/numerical').BADNUM;
1313

1414

1515
module.exports = function linePoints(d, opts) {
@@ -20,7 +20,6 @@ module.exports = function linePoints(d, opts) {
2020
baseTolerance = opts.baseTolerance,
2121
linear = opts.linear,
2222
segments = [],
23-
badnum = Axes.BADNUM,
2423
minTolerance = 0.2, // fraction of tolerance "so close we don't even consider it a new point"
2524
pts = new Array(d.length),
2625
pti = 0,
@@ -57,7 +56,7 @@ module.exports = function linePoints(d, opts) {
5756
function getPt(index) {
5857
var x = xa.c2p(d[index].x),
5958
y = ya.c2p(d[index].y);
60-
if(x === badnum || y === badnum) return false;
59+
if(x === BADNUM || y === BADNUM) return false;
6160
return [x, y];
6261
}
6362

0 commit comments

Comments
 (0)