Skip to content

Commit 113ec69

Browse files
committed
centralize autorange options defaults
1 parent c528781 commit 113ec69

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
'use strict';
2+
3+
module.exports = function handleAutorangeOptionsDefaults(coerce) {
4+
var autorangemin = coerce('autorangemin');
5+
var autorangemax = coerce('autorangemax');
6+
7+
if(autorangemin === undefined) coerce('autorangeclipmin');
8+
if(autorangemax === undefined) coerce('autorangeclipmax');
9+
10+
coerce('autorangeinclude');
11+
};

src/plots/cartesian/axis_defaults.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var handleTickLabelDefaults = require('./tick_label_defaults');
1515
var handlePrefixSuffixDefaults = require('./prefix_suffix_defaults');
1616
var handleCategoryOrderDefaults = require('./category_order_defaults');
1717
var handleLineGridDefaults = require('./line_grid_defaults');
18+
var handleAutorangeOptionsDefaults = require('./autorange_options_defaults');
1819
var setConvert = require('./set_convert');
1920

2021
var DAY_OF_WEEK = require('./constants').WEEKDAY_PATTERN;
@@ -95,13 +96,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
9596
if(autorangeDflt && options.reverseDflt) autorangeDflt = 'reversed';
9697
var autoRange = coerce('autorange', autorangeDflt);
9798
if(autoRange) {
98-
var autorangemin = coerce('autorangemin');
99-
var autorangemax = coerce('autorangemax');
100-
101-
if(autorangemin === undefined) coerce('autorangeclipmin');
102-
if(autorangemax === undefined) coerce('autorangeclipmax');
103-
104-
coerce('autorangeinclude');
99+
handleAutorangeOptionsDefaults(coerce);
105100

106101
if(axType === 'linear' || axType === '-') coerce('rangemode');
107102
}

src/plots/polar/layout_defaults.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var handleTickLabelDefaults = require('../cartesian/tick_label_defaults');
1313
var handlePrefixSuffixDefaults = require('../cartesian/prefix_suffix_defaults');
1414
var handleCategoryOrderDefaults = require('../cartesian/category_order_defaults');
1515
var handleLineGridDefaults = require('../cartesian/line_grid_defaults');
16+
var handleAutorangeOptionsDefaults = require('../cartesian/autorange_options_defaults');
1617
var autoType = require('../cartesian/axis_autotype');
1718

1819
var layoutAttributes = require('./layout_attributes');
@@ -79,13 +80,7 @@ function handleDefaults(contIn, contOut, coerce, opts) {
7980
var autoRange = coerceAxis('autorange', !axOut.isValidRange(axIn.range));
8081
axIn.autorange = autoRange;
8182
if(autoRange) {
82-
var autorangemin = coerceAxis('autorangemin');
83-
var autorangemax = coerceAxis('autorangemax');
84-
85-
if(autorangemin === undefined) coerceAxis('autorangeclipmin');
86-
if(autorangemax === undefined) coerceAxis('autorangeclipmax');
87-
88-
coerceAxis('autorangeinclude');
83+
handleAutorangeOptionsDefaults(coerceAxis);
8984

9085
if(axType === 'linear' || axType === '-') coerceAxis('rangemode');
9186
if(autoRange === 'reversed') axOut._m = -1;

0 commit comments

Comments
 (0)