Skip to content

Commit b845632

Browse files
committed
do not coerce operation for (day of week) pattern
1 parent aa8152b commit b845632

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/plots/cartesian/axis_defaults.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ var handleCategoryOrderDefaults = require('./category_order_defaults');
2121
var handleLineGridDefaults = require('./line_grid_defaults');
2222
var setConvert = require('./set_convert');
2323

24+
var constants = require('./constants');
25+
var WEEKDAY_PATTERN = constants.WEEKDAY_PATTERN;
26+
2427
/**
2528
* options: object containing:
2629
*
@@ -156,6 +159,8 @@ function rangebreaksDefaults(itemIn, itemOut, containerOut) {
156159
if(enabled) {
157160
var bnds = coerce('bounds');
158161

162+
var pattern;
163+
159164
if(bnds && bnds.length >= 2) {
160165
if(bnds.length > 2) {
161166
itemOut.bounds = itemOut.bounds.slice(0, 2);
@@ -176,7 +181,7 @@ function rangebreaksDefaults(itemIn, itemOut, containerOut) {
176181
}
177182
}
178183

179-
coerce('pattern');
184+
pattern = coerce('pattern');
180185
} else {
181186
var values = coerce('values');
182187

@@ -188,6 +193,8 @@ function rangebreaksDefaults(itemIn, itemOut, containerOut) {
188193
}
189194
}
190195

191-
coerce('operation');
196+
if(pattern !== WEEKDAY_PATTERN) {
197+
coerce('operation');
198+
}
192199
}
193200
}

src/plots/cartesian/set_convert.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ module.exports = function setConvert(ax, fullLayout) {
620620
var brk = rangebreaksIn[i];
621621

622622
if(brk.enabled) {
623-
var op = brk.operation;
623+
var op = brk.operation || '[)';
624624
var op0 = op.charAt(0);
625625
var op1 = op.charAt(1);
626626

@@ -737,7 +737,7 @@ module.exports = function setConvert(ax, fullLayout) {
737737
var brk = rangebreaksIn[i];
738738

739739
if(brk.enabled) {
740-
var op = brk.operation;
740+
var op = brk.operation || '[)';
741741
var op0 = op.charAt(0);
742742
var op1 = op.charAt(1);
743743

0 commit comments

Comments
 (0)