Refactor PlotSchema

src/components/annotations/attributes.js

@@ -15,7 +15,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
 
 
 module.exports = {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'annotation',
 
     visible: {
         valType: 'boolean',

src/components/annotations/index.js

@@ -9,28 +9,16 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
-
-exports.moduleType = 'component';
-
-exports.name = 'annotations';
-
-exports.ARROWPATHS = require('./arrow_paths');
-
-exports.layoutAttributes = require('./attributes');
-
-exports.supplyLayoutDefaults = require('./defaults');
-
-exports.calcAutorange = require('./calc_autorange');
-
-exports.arrowhead = require('./draw_arrow_head');
-
 var drawModule = require('./draw');
-exports.draw = drawModule.draw;
-exports.drawOne = drawModule.drawOne;
 
-exports.add = function(gd) {
-    var nextAnn = gd._fullLayout.annotations.length;
+module.exports = {
+    moduleType: 'component',
+    name: 'annotations',
+
+    layoutAttributes: require('./attributes'),
+    supplyLayoutDefaults: require('./defaults'),
 
-    Plotly.relayout(gd, 'annotations[' + nextAnn + ']', 'add');
+    calcAutorange: require('./calc_autorange'),
+    draw: drawModule.draw,
+    drawOne: drawModule.drawOne
 };

src/components/images/attributes.js

@@ -12,7 +12,7 @@ var cartesianConstants = require('../../plots/cartesian/constants');
 
 
 module.exports = {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'image',
 
     visible: {
         valType: 'boolean',

src/components/images/index.js

@@ -8,16 +8,12 @@
 
 'use strict';
 
-
-var draw = require('./draw');
-var supplyLayoutDefaults = require('./defaults');
-var attributes = require('./attributes');
-
-
 module.exports = {
     moduleType: 'component',
     name: 'images',
-    draw: draw,
-    layoutAttributes: attributes,
-    supplyLayoutDefaults: supplyLayoutDefaults
+
+    layoutAttributes: require('./attributes'),
+    supplyLayoutDefaults: require('./defaults'),
+
+    draw: require('./draw')
 };

src/components/legend/index.js

@@ -10,17 +10,13 @@
 'use strict';
 
 
-var legend = module.exports = {};
+module.exports = {
+    moduleType: 'component',
+    name: 'legend',
 
+    layoutAttributes: require('./attributes'),
+    supplyLayoutDefaults: require('./defaults'),
 
-legend.moduleType = 'component';
-
-legend.name = 'legend';
-
-legend.layoutAttributes = require('./attributes');
-
-legend.supplyLayoutDefaults = require('./defaults');
-
-legend.draw = require('./draw');
-
-legend.style = require('./style');
+    draw: require('./draw'),
+    style: require('./style')
+};

src/components/rangeselector/attributes.js

@@ -14,7 +14,8 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var buttonAttrs = require('./button_attributes');
 
 buttonAttrs = extendFlat(buttonAttrs, {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'button',
+
     description: [
         'Sets the specifications for each buttons.',
         'By default, a range selector comes with no buttons.'

src/components/rangeselector/index.js

@@ -8,13 +8,13 @@
 
 'use strict';
 
+module.exports = {
+    moduleType: 'component',
+    name: 'rangeselector',
 
-exports.moduleType = 'component';
+    layoutNodes: ['xaxis.'],
+    layoutAttributes: require('./attributes'),
+    handleDefaults: require('./defaults'),
 
-exports.name = 'rangeselector';
-
-exports.layoutAttributes = require('./attributes');
-
-exports.handleDefaults = require('./defaults');
-
-exports.draw = require('./draw');
+    draw: require('./draw')
+};

src/components/rangeslider/index.js

@@ -11,7 +11,10 @@
 module.exports = {
     moduleType: 'component',
     name: 'rangeslider',
+
+    layoutNodes: ['xaxis.'],
     layoutAttributes: require('./attributes'),
     handleDefaults: require('./defaults'),
+
     draw: require('./draw')
 };

src/components/shapes/attributes.js

@@ -15,7 +15,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var scatterLineAttrs = scatterAttrs.line;
 
 module.exports = {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'shape',
 
     visible: {
         valType: 'boolean',

src/components/shapes/index.js

@@ -9,16 +9,16 @@
 
 'use strict';
 
-exports.moduleType = 'component';
-
-exports.name = 'shapes';
-
-exports.layoutAttributes = require('./attributes');
+var drawModule = require('./draw');
 
-exports.supplyLayoutDefaults = require('./defaults');
+module.exports = {
+    moduleType: 'component',
+    name: 'shapes',
 
-exports.calcAutorange = require('./calc_autorange');
+    layoutAttributes: require('./attributes'),
+    supplyLayoutDefaults: require('./defaults'),
 
-var drawModule = require('./draw');
-exports.draw = drawModule.draw;
-exports.drawOne = drawModule.drawOne;
+    calcAutorange: require('./calc_autorange'),
+    draw: drawModule.draw,
+    drawOne: drawModule.drawOne
+};

src/components/sliders/attributes.js

@@ -16,7 +16,7 @@ var animationAttrs = require('../../plots/animation_attributes');
 var constants = require('./constants');
 
 var stepsAttrs = {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'step',
 
     method: {
         valType: 'enumerated',
@@ -57,6 +57,8 @@ var stepsAttrs = {
 };
 
 module.exports = {
+    _isLinkedToArray: 'slider',
+
     visible: {
         valType: 'boolean',
         role: 'info',

src/components/sliders/constants.js

@@ -12,9 +12,8 @@
 
 module.exports = {
 
-    // layout attribute names
+    // layout attribute name
     name: 'sliders',
-    itemName: 'slider',
 
     // class names
     containerClassName: 'slider-container',

src/components/sliders/index.js

@@ -8,13 +8,14 @@
 
 'use strict';
 
+var constants = require('./constants');
 
-exports.moduleType = 'component';
+module.exports = {
+    moduleType: 'component',
+    name: constants.name,
 
-exports.name = 'sliders';
+    layoutAttributes: require('./attributes'),
+    supplyLayoutDefaults: require('./defaults'),
 
-exports.layoutAttributes = require('./attributes');
-
-exports.supplyLayoutDefaults = require('./defaults');
-
-exports.draw = require('./draw');
+    draw: require('./draw')
+};

src/components/updatemenus/attributes.js

@@ -14,7 +14,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var padAttrs = require('../../plots/pad_attributes');
 
 var buttonsAttrs = {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'button',
 
     method: {
         valType: 'enumerated',
@@ -48,7 +48,7 @@ var buttonsAttrs = {
 };
 
 module.exports = {
-    _isLinkedToArray: true,
+    _isLinkedToArray: 'updatemenu',
 
     visible: {
         valType: 'boolean',

src/components/updatemenus/constants.js

@@ -12,9 +12,8 @@
 
 module.exports = {
 
-    // layout attribute names
+    // layout attribute name
     name: 'updatemenus',
-    itemName: 'updatemenu',
 
     // class names
     containerClassName: 'updatemenu-container',

src/components/updatemenus/index.js

@@ -8,13 +8,14 @@
 
 'use strict';
 
+var constants = require('./constants');
 
-exports.moduleType = 'component';
+module.exports = {
+    moduleType: 'component',
+    name: constants.name,
 
-exports.name = 'updatemenus';
+    layoutAttributes: require('./attributes'),
+    supplyLayoutDefaults: require('./defaults'),
 
-exports.layoutAttributes = require('./attributes');
-
-exports.supplyLayoutDefaults = require('./defaults');
-
-exports.draw = require('./draw');
+    draw: require('./draw')
+};