Skip to content

Commit 0d20931

Browse files
etpinardmdtusz
authored andcommitted
make range selector module more like range slider:
- change directory name to rangeselector (instead of range_selector) - rename default func supplyLayoutDefaults (instead of supplyDefaults) - require full module into cartesian defaults
1 parent 17c8377 commit 0d20931

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

src/components/range_selector/constants.js renamed to src/components/rangeselector/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111

1212
module.exports = {
13-
13+
1414

1515
};

src/components/range_selector/index.js renamed to src/components/rangeselector/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
'use strict';
1010

11+
1112
exports.attributes = require('./attributes');
1213

13-
exports.supplyDefaults = require('./defaults');
14+
exports.supplyLayoutDefaults = require('./defaults');
1415

1516
exports.draw = require('./draw');

src/plot_api/plot_api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ var Drawing = require('../components/drawing');
2626
var ErrorBars = require('../components/errorbars');
2727
var Legend = require('../components/legend');
2828
var RangeSlider = require('../components/rangeslider');
29+
var RangeSelector = require('../components/rangeselector');
2930
var Shapes = require('../components/shapes');
3031
var Titles = require('../components/titles');
31-
var RangeSelector = require('../components/range_selector');
3232
var manageModeBar = require('../components/modebar/manage');
3333
var xmlnsNamespaces = require('../constants/xmlns_namespaces');
3434

src/plots/cartesian/layout_defaults.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var Lib = require('../../lib');
1313
var Plots = require('../plots');
1414

1515
var RangeSlider = require('../../components/rangeslider');
16-
var rangeSelectorDefaults = require('../../components/range_selector/defaults');
16+
var RangeSelector = require('../../components/rangeselector');
1717

1818
var constants = require('./constants');
1919
var layoutAttributes = require('./layout_attributes');
@@ -135,8 +135,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
135135
handlePositionDefaults(axLayoutIn, axLayoutOut, coerce, positioningOptions);
136136

137137
if(axLetter === 'x' && axLayoutOut.type === 'date') {
138-
// TODO add check on axis type 'date'
139-
rangeSelectorDefaults(axLayoutIn, axLayoutOut, layoutOut);
138+
RangeSelector.supplyLayoutDefaults(axLayoutIn, axLayoutOut, layoutOut);
140139
}
141140

142141
layoutOut[axName] = axLayoutOut;

test/jasmine/tests/range_selector_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
var RangeSelector = require('@src/components/range_selector');
2-
var getUpdateObject = require('@src/components/range_selector/get_update_object');
1+
var RangeSelector = require('@src/components/rangeselector');
2+
var getUpdateObject = require('@src/components/rangeselector/get_update_object');
33

44

55
describe('range selector', function() {
66
'use strict';
77

88
describe('defaults', function() {
9-
var supplyDefaults = RangeSelector.supplyDefaults;
9+
var supplyLayoutDefaults = RangeSelector.supplyLayoutDefaults;
1010

1111
it('should set \'visible\' to false when no buttons are present', function() {
1212
var containerIn = {};
1313
var containerOut = {};
1414

15-
supplyDefaults(containerIn, containerOut, {});
15+
supplyLayoutDefaults(containerIn, containerOut, {});
1616

1717
expect(containerOut.rangeselector)
1818
.toEqual({
@@ -34,7 +34,7 @@ describe('range selector', function() {
3434
};
3535
var containerOut = {};
3636

37-
supplyDefaults(containerIn, containerOut, {});
37+
supplyLayoutDefaults(containerIn, containerOut, {});
3838

3939
expect(containerOut.rangeselector.visible).toBe(true);
4040
expect(containerOut.rangeselector.buttons).toEqual([

0 commit comments

Comments
 (0)