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

Author: etpinard

src/components/annotations/index.js

@@ -11,6 +11,9 @@
 
 var Plotly = require('../../plotly');
 
+exports.moduleType = 'component';
+
+exports.name = 'annotations';
 
 exports.ARROWPATHS = require('./arrow_paths');
 

src/components/images/index.js

@@ -15,6 +15,8 @@ var attributes = require('./attributes');
 
 
 module.exports = {
+    moduleType: 'component',
+    name: 'images',
     draw: draw,
     layoutAttributes: attributes,
     supplyLayoutDefaults: supplyLayoutDefaults

src/components/legend/index.js

@@ -12,6 +12,11 @@
 
 var legend = module.exports = {};
 
+
+legend.moduleType = 'component';
+
+legend.name = 'legend';
+
 legend.layoutAttributes = require('./attributes');
 
 legend.supplyLayoutDefaults = require('./defaults');

src/components/rangeselector/defaults.js

@@ -16,7 +16,7 @@ var buttonAttrs = require('./button_attributes');
 var constants = require('./constants');
 
 
-module.exports = function rangeSelectorDefaults(containerIn, containerOut, layout, counterAxes) {
+module.exports = function handleDefaults(containerIn, containerOut, layout, counterAxes) {
     var selectorIn = containerIn.rangeselector || {},
         selectorOut = containerOut.rangeselector = {};
 

src/components/rangeselector/index.js

@@ -9,8 +9,12 @@
 'use strict';
 
 
-exports.attributes = require('./attributes');
+exports.moduleType = 'component';
 
-exports.supplyLayoutDefaults = require('./defaults');
+exports.name = 'rangeselector';
+
+exports.layoutAttributes = require('./attributes');
+
+exports.handleDefaults = require('./defaults');
 
 exports.draw = require('./draw');

src/components/rangeslider/defaults.js

@@ -12,7 +12,7 @@ var Lib = require('../../lib');
 var attributes = require('./attributes');
 
 
-module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes) {
+module.exports = function handleDefaults(layoutIn, layoutOut, axName, counterAxes) {
     if(!layoutIn[axName].rangeslider) return;
 
     var containerIn = Lib.isPlainObject(layoutIn[axName].rangeslider) ?

src/components/rangeslider/index.js

@@ -12,12 +12,16 @@
 var Plots = require('../../plots/plots');
 
 var createSlider = require('./create_slider');
-var supplyLayoutDefaults = require('./defaults');
+var layoutAttributes = require('./attributes');
+var handleDefaults = require('./defaults');
 
 
 module.exports = {
-    draw: draw,
-    supplyLayoutDefaults: supplyLayoutDefaults
+    moduleType: 'component',
+    name: 'rangeslider',
+    layoutAttributes: layoutAttributes,
+    handleDefaults: handleDefaults,
+    draw: draw
 };
 
 function draw(gd) {

src/components/shapes/index.js

@@ -9,6 +9,9 @@
 
 'use strict';
 
+exports.moduleType = 'component';
+
+exports.name = 'shapes';
 
 exports.layoutAttributes = require('./attributes');
 

src/components/updatemenus/index.js

@@ -9,6 +9,10 @@
 'use strict';
 
 
+exports.moduleType = 'component';
+
+exports.name = 'updatemenus';
+
 exports.layoutAttributes = require('./attributes');
 
 exports.supplyLayoutDefaults = require('./defaults');

src/core.js

@@ -47,6 +47,17 @@ exports.validate = require('./plot_api/validate');
 // scatter is the only trace included by default
 exports.register(require('./traces/scatter'));
 
+// register all registrable components modules
+exports.register([
+    require('./components/legend'),
+    require('./components/annotations'),
+    require('./components/shapes'),
+    require('./components/images'),
+    require('./components/updatemenus'),
+    require('./components/rangeslider'),
+    require('./components/rangeselector')
+]);
+
 // plot icons
 exports.Icons = require('../build/ploticon');
 

test/jasmine/tests/range_selector_test.js

@@ -14,7 +14,7 @@ var mouseEvent = require('../assets/mouse_event');
 describe('range selector defaults:', function() {
     'use strict';
 
-    var supplyLayoutDefaults = RangeSelector.supplyLayoutDefaults;
+    var handleDefaults = RangeSelector.handleDefaults;
 
     function supply(containerIn, containerOut) {
         containerOut.domain = [0, 1];
@@ -25,7 +25,7 @@ describe('range selector defaults:', function() {
 
         var counterAxes = ['yaxis'];
 
-        supplyLayoutDefaults(containerIn, containerOut, layout, counterAxes);
+        handleDefaults(containerIn, containerOut, layout, counterAxes);
     }
 
     it('should set \'visible\' to false when no buttons are present', function() {
@@ -139,7 +139,7 @@ describe('range selector defaults:', function() {
         };
         var counterAxes = ['yaxis'];
 
-        supplyLayoutDefaults(containerIn, containerOut, layout, counterAxes);
+        handleDefaults(containerIn, containerOut, layout, counterAxes);
 
         expect(containerOut.rangeselector.x).toEqual(0);
         expect(containerOut.rangeselector.y).toBeCloseTo(0.47);
@@ -170,7 +170,7 @@ describe('range selector defaults:', function() {
         };
         var counterAxes = ['yaxis', 'yaxis2', 'yaxis3'];
 
-        supplyLayoutDefaults(containerIn, containerOut, layout, counterAxes);
+        handleDefaults(containerIn, containerOut, layout, counterAxes);
 
         expect(containerOut.rangeselector.x).toEqual(0.5);
         expect(containerOut.rangeselector.y).toBeCloseTo(0.87);

test/jasmine/tests/range_slider_test.js

@@ -214,7 +214,7 @@ describe('the range slider', function() {
         });
     });
 
-    describe('supplyLayoutDefaults function', function() {
+    describe('handleDefaults function', function() {
 
         it('should not coerce anything if rangeslider isn\'t set', function() {
             var layoutIn = { xaxis: {}, yaxis: {}},
@@ -223,7 +223,7 @@ describe('the range slider', function() {
                 counterAxes = ['yaxis'],
                 expected = { xaxis: {}, yaxis: {}};
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutIn).toEqual(expected);
         });
@@ -235,7 +235,7 @@ describe('the range slider', function() {
                 counterAxes = ['yaxis'],
                 expected = { xaxis: { rangeslider: { visible: true }}, yaxis: {}};
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutIn).toEqual(expected);
         });
@@ -261,7 +261,7 @@ describe('the range slider', function() {
                     }
                 };
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutOut).toEqual(expected);
         });
@@ -287,7 +287,7 @@ describe('the range slider', function() {
                     }
                 };
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutOut).toEqual(expected);
         });
@@ -319,7 +319,7 @@ describe('the range slider', function() {
                     }
                 };
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutOut).toEqual(expected);
         });
@@ -344,7 +344,7 @@ describe('the range slider', function() {
                     yaxis2: { fixedrange: true }
                 };
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutOut).toEqual(expected);
         });
@@ -369,7 +369,7 @@ describe('the range slider', function() {
                     yaxis: { fixedrange: true }
                 };
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutOut).toEqual(expected);
         });
@@ -394,7 +394,7 @@ describe('the range slider', function() {
                     yaxis: { fixedrange: true }
                 };
 
-            RangeSlider.supplyLayoutDefaults(layoutIn, layoutOut, axName, counterAxes);
+            RangeSlider.handleDefaults(layoutIn, layoutOut, axName, counterAxes);
 
             expect(layoutOut).toEqual(expected);
         });