Skip to content

Commit 6206b29

Browse files
committed
refactor making msUTC an option object instead of a boolean
1 parent 6c949ef commit 6206b29

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/plots/cartesian/set_convert.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ module.exports = function setConvert(ax, fullLayout) {
9090
* - inserts a dummy arg so calendar is the 3rd arg (see notes below).
9191
* - defaults to ax.calendar
9292
*/
93-
function dt2ms(v, _, calendar, msUTC) {
93+
function dt2ms(v, _, calendar, opts) {
9494
// NOTE: Changed this behavior: previously we took any numeric value
9595
// to be a ms, even if it was a string that could be a bare year.
9696
// Now we convert it as a date if at all possible, and only try
@@ -99,7 +99,7 @@ module.exports = function setConvert(ax, fullLayout) {
9999
if(ms === BADNUM) {
100100
if(isNumeric(v)) {
101101
v = +v;
102-
if(msUTC) {
102+
if((opts || {}).msUTC) {
103103
// For now it is only used
104104
// to fix bar length in milliseconds.
105105
// It could be applied in other places in v2
@@ -798,7 +798,7 @@ module.exports = function setConvert(ax, fullLayout) {
798798
// the first letter of ax._id?)
799799
// in case the expected data isn't there, make a list of
800800
// integers based on the opposite data
801-
ax.makeCalcdata = function(trace, axLetter, msUTC) {
801+
ax.makeCalcdata = function(trace, axLetter, opts) {
802802
var arrayIn, arrayOut, i, len;
803803

804804
var axType = ax.type;
@@ -822,10 +822,10 @@ module.exports = function setConvert(ax, fullLayout) {
822822

823823
arrayOut = new Array(len);
824824
for(i = 0; i < len; i++) {
825-
arrayOut[i] = ax.d2c(arrayIn[i], 0, cal, msUTC);
825+
arrayOut[i] = ax.d2c(arrayIn[i], 0, cal, opts);
826826
}
827827
} else {
828-
var v0 = ((axLetter + '0') in trace) ? ax.d2c(trace[axLetter + '0'], 0, cal, false) : 0;
828+
var v0 = ((axLetter + '0') in trace) ? ax.d2c(trace[axLetter + '0'], 0, cal) : 0;
829829
var dv = (trace['d' + axLetter]) ? Number(trace['d' + axLetter]) : 1;
830830

831831
// the opposing data, for size if we have x and dx etc

src/traces/bar/calc.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ module.exports = function calc(gd, trace) {
1919
var ya = Axes.getFromId(gd, trace.yaxis || 'y');
2020
var size, pos;
2121

22-
var msUTC = !!(trace.base || trace.base === 0);
22+
var sizeOpts = {
23+
msUTC: !!(trace.base || trace.base === 0)
24+
};
2325

2426
if(trace.orientation === 'h') {
25-
size = xa.makeCalcdata(trace, 'x', msUTC);
27+
size = xa.makeCalcdata(trace, 'x', sizeOpts);
2628
pos = ya.makeCalcdata(trace, 'y');
2729
} else {
28-
size = ya.makeCalcdata(trace, 'y', msUTC);
30+
size = ya.makeCalcdata(trace, 'y', sizeOpts);
2931
pos = xa.makeCalcdata(trace, 'x');
3032
}
3133

0 commit comments

Comments
 (0)