Skip to content

Commit 68268e3

Browse files
committed
register components modules
- legend, annotations, shapes, images, rangeslider, rangeselector and updatemenus are now registerd in src/core.js - add 'moduleType' and 'name' properties to component modules - rename 'attributes' prop -> 'layoutAttributes' (for consistency) - rename 'supplyLayoutDefaults' -> 'handleDefaults' when component defaults are required in another default module
1 parent c6aa0fb commit 68268e3

File tree

12 files changed

+56
-20
lines changed

12 files changed

+56
-20
lines changed

src/components/annotations/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
var Plotly = require('../../plotly');
1313

14+
exports.moduleType = 'component';
15+
16+
exports.name = 'annotations';
1417

1518
exports.ARROWPATHS = require('./arrow_paths');
1619

src/components/images/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ var attributes = require('./attributes');
1515

1616

1717
module.exports = {
18+
moduleType: 'component',
19+
name: 'images',
1820
draw: draw,
1921
layoutAttributes: attributes,
2022
supplyLayoutDefaults: supplyLayoutDefaults

src/components/legend/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212

1313
var legend = module.exports = {};
1414

15+
16+
legend.moduleType = 'component';
17+
18+
legend.name = 'legend';
19+
1520
legend.layoutAttributes = require('./attributes');
1621

1722
legend.supplyLayoutDefaults = require('./defaults');

src/components/rangeselector/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var buttonAttrs = require('./button_attributes');
1616
var constants = require('./constants');
1717

1818

19-
module.exports = function rangeSelectorDefaults(containerIn, containerOut, layout, counterAxes) {
19+
module.exports = function handleDefaults(containerIn, containerOut, layout, counterAxes) {
2020
var selectorIn = containerIn.rangeselector || {},
2121
selectorOut = containerOut.rangeselector = {};
2222

src/components/rangeselector/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
'use strict';
1010

1111

12-
exports.attributes = require('./attributes');
12+
exports.moduleType = 'component';
1313

14-
exports.supplyLayoutDefaults = require('./defaults');
14+
exports.name = 'rangeselector';
15+
16+
exports.layoutAttributes = require('./attributes');
17+
18+
exports.handleDefaults = require('./defaults');
1519

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

src/components/rangeslider/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var Lib = require('../../lib');
1212
var attributes = require('./attributes');
1313

1414

15-
module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes) {
15+
module.exports = function handleDefaults(layoutIn, layoutOut, axName, counterAxes) {
1616
if(!layoutIn[axName].rangeslider) return;
1717

1818
var containerIn = Lib.isPlainObject(layoutIn[axName].rangeslider) ?

src/components/rangeslider/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@
1212
var Plots = require('../../plots/plots');
1313

1414
var createSlider = require('./create_slider');
15-
var supplyLayoutDefaults = require('./defaults');
15+
var layoutAttributes = require('./attributes');
16+
var handleDefaults = require('./defaults');
1617

1718

1819
module.exports = {
19-
draw: draw,
20-
supplyLayoutDefaults: supplyLayoutDefaults
20+
moduleType: 'component',
21+
name: 'rangeslider',
22+
layoutAttributes: layoutAttributes,
23+
handleDefaults: handleDefaults,
24+
draw: draw
2125
};
2226

2327
function draw(gd) {

src/components/shapes/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
'use strict';
1111

12+
exports.moduleType = 'component';
13+
14+
exports.name = 'shapes';
1215

1316
exports.layoutAttributes = require('./attributes');
1417

src/components/updatemenus/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
'use strict';
1010

1111

12+
exports.moduleType = 'component';
13+
14+
exports.name = 'updatemenus';
15+
1216
exports.layoutAttributes = require('./attributes');
1317

1418
exports.supplyLayoutDefaults = require('./defaults');

src/core.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ exports.validate = require('./plot_api/validate');
4747
// scatter is the only trace included by default
4848
exports.register(require('./traces/scatter'));
4949

50+
// register all registrable components modules
51+
exports.register([
52+
require('./components/legend'),
53+
require('./components/annotations'),
54+
require('./components/shapes'),
55+
require('./components/images'),
56+
require('./components/updatemenus'),
57+
require('./components/rangeslider'),
58+
require('./components/rangeselector')
59+
]);
60+
5061
// plot icons
5162
exports.Icons = require('../build/ploticon');
5263

0 commit comments

Comments
 (0)