make attributes files require in attributes file directly:

- do not require in Plotly when not necessary

Author: etpinard

src/components/annotations/attributes.js

@@ -1,9 +1,7 @@
-'use strict';
-
 var Plotly = require('../../plotly');
 var ARROWPATHS = require('./arrow_paths');
-
-var extendFlat = Plotly.Lib.extendFlat;
+var fontAttrs = require('../../plots/plots/font_attributes');
+var extendFlat = require('../../lib/extend').extendFlat;
 
 module.exports = {
     _isLinkedToArray: true,
@@ -28,7 +26,7 @@ module.exports = {
             'with respect to the horizontal.'
         ].join(' ')
     },
-    font: extendFlat({}, Plotly.Plots.fontAttrs, {
+    font: extendFlat({}, fontAttrs, {
         description: 'Sets the annotation text font.'
     }),
     opacity: {

src/components/colorbar/attributes.js

@@ -1,9 +1,6 @@
-'use strict';
-
-var Plotly = require('../../plotly');
-
-var axesAttrs = Plotly.Axes.layoutAttributes;
-var extendFlat = Plotly.Lib.extendFlat;
+var axesAttrs = require('../../plots/cartesian/attributes');
+var fontAttrs = require('../../plots/plots/font_attributes');
+var extendFlat = require('../../lib/extend').extendFlat;
 
 module.exports = {
 // TODO: only right is supported currently
@@ -167,7 +164,7 @@ module.exports = {
         dflt: 'Click to enter colorscale title',
         description: 'Sets the title of the color bar.'
     },
-    titlefont: extendFlat({}, Plotly.Plots.fontAttrs, {
+    titlefont: extendFlat({}, fontAttrs, {
         description: [
             'Sets this color bar\'s title font.'
         ].join(' ')

src/components/legend/attributes.js

@@ -1,7 +1,6 @@
-'use strict';
-
-var Plotly = require('../../plotly');
-var extendFlat = Plotly.Lib.extendFlat;
+var fontAttrs = require('../../plots/plots/font_attributes');
+var colorAttrs = require('../color/attributes');
+var extendFlat = require('../../lib/extend').extendFlat;
 
 
 module.exports = {
@@ -12,7 +11,7 @@ module.exports = {
     },
     bordercolor: {
         valType: 'color',
-        dflt: Plotly.Color.defaultLine,
+        dflt: colorAttrs.defaultLine,
         role: 'style',
         description: 'Sets the color of the border enclosing the legend.'
     },
@@ -23,7 +22,7 @@ module.exports = {
         role: 'style',
         description: 'Sets the width (in px) of the border enclosing the legend.'
     },
-    font: extendFlat({}, Plotly.Plots.fontAttrs, {
+    font: extendFlat({}, fontAttrs, {
         description: 'Sets the font used to text the legend items.'
     }),
     traceorder: {

src/components/shapes/attributes.js

@@ -1,7 +1,8 @@
-var Plotly = require('../../plotly');
+var annAttrs = require('../annotations/attributes');
+var scatterAttrs = require('../../traces/scatter/attributes');
+var extendFlat = require('../../lib/extend').extendFlat;
 
-var scatterLineAttrs = Plotly.Scatter.attributes.line;
-var extendFlat = Plotly.Lib.extendFlat;
+var scatterLineAttrs = scatterAttrs.line;
 
 module.exports = {
     _isLinkedToArray: true,
@@ -27,7 +28,7 @@ module.exports = {
         ].join(' ')
     },
 
-    xref: extendFlat({}, Plotly.Annotations.layoutAttributes.xref, {
+    xref: extendFlat({}, annAttrs.xref, {
         description: [
             'Sets the shape\'s x coordinate axis.',
             'If set to an x axis id (e.g. *x* or *x2*), the `x` position',
@@ -54,7 +55,7 @@ module.exports = {
         ].join(' ')
     },
 
-    yref: extendFlat({}, Plotly.Annotations.layoutAttributes.yref, {
+    yref: extendFlat({}, annAttrs.yref, {
         description: [
             'Sets the annotation\'s y coordinate axis.',
             'If set to an y axis id (e.g. *y* or *y2*), the `y` position',

src/lib/gl_format_color.js

@@ -5,8 +5,8 @@ var tinycolor = require('tinycolor2');
 var isNumeric = require('fast-isnumeric');
 var str2RgbaArray = require('./str2rgbarray');
 
-var colorDflt = Plotly.Color.defaultLine,
-    opacityDflt = 1;
+var colorDflt = require('../components/color/attributes').defaultLine;
+var opacityDflt = 1;
 
 function calculateColor(colorIn, opacityIn) {
     var colorOut = str2RgbaArray(colorIn);

src/plots/plots/attributes.js

@@ -1,11 +1,8 @@
-var Plotly = require('../../plotly');
-var plots = require('./plots');
-
 module.exports = {
     type: {
         valType: 'enumerated',
         role: 'info',
-        values: plots.allTypes,
+        values: [],     // listed dynamically
         dflt: 'scatter'
     },
     visible: {

src/plots/plots/layout_attributes.js

@@ -1,19 +1,21 @@
 var Plotly = require('../../plotly');
-var plots = require('./plots');
+
+var fontAttrs = require('./font_attributes');
+var colorAttrs = require('../../components/color/attributes');
 
 var extendFlat = Plotly.Lib.extendFlat;
 
 
 module.exports = {
     font: {
-        family: extendFlat({}, plots.fontAttrs.family, {
+        family: extendFlat({}, fontAttrs.family, {
             dflt: '"Open sans", verdana, arial, sans-serif'
         }),
-        size: extendFlat({}, plots.fontAttrs.size, {
+        size: extendFlat({}, fontAttrs.size, {
             dflt: 12
         }),
-        color: extendFlat({}, plots.fontAttrs.color, {
-            dflt: Plotly.Color.defaultLine
+        color: extendFlat({}, fontAttrs.color, {
+            dflt: colorAttrs.defaultLine
         }),
         description: [
             'Sets the global font.',
@@ -29,7 +31,7 @@ module.exports = {
             'Sets the plot\'s title.'
         ].join(' ')
     },
-    titlefont: extendFlat({}, plots.fontAttrs, {
+    titlefont: extendFlat({}, fontAttrs, {
         description: 'Sets the title font.'
     }),
     autosize: {
@@ -108,15 +110,15 @@ module.exports = {
     paper_bgcolor: {
         valType: 'color',
         role: 'style',
-        dflt: Plotly.Color.background,
+        dflt: colorAttrs.background,
         description: 'Sets the color of paper where the graph is drawn.'
     },
     plot_bgcolor: {
         // defined here, but set in Axes.supplyLayoutDefaults
         // because it needs to know if there are (2D) axes or not
         valType: 'color',
         role: 'style',
-        dflt: Plotly.Color.background,
+        dflt: colorAttrs.background,
         description: [
             'Sets the color of plotting area in-between x and y axes.'
         ].join(' ')
@@ -183,7 +185,7 @@ module.exports = {
         'xaxis': 'Axes',
         'yaxis': 'Axes',
         'scene': 'Gl3dLayout',  // TODO should be Scene
-        'geo': 'GeoLayout',     // TODO should be Geo
+        'geo': 'Geo',
         'legend': 'Legend',
         'annotations': 'Annotations',
         'shapes': 'Shapes'

src/plots/plots/plots.js

@@ -12,6 +12,7 @@ var modules = plots.modules = {},
     subplotsRegistry = plots.subplotsRegistry = {};
 
 plots.attributes = require('./attributes');
+plots.attributes.type.values = allTypes;
 plots.fontAttrs = require('./font_attributes');
 plots.layoutAttributes = require('./layout_attributes');
 

src/polar/utils/undo_manager.js

@@ -1,8 +1,4 @@
-'use strict';
-
-var Plotly = require('../../plotly');
-
-var scatterAttrs = Plotly.Scatter.attributes,
+var scatterAttrs = require('../scatter/attributes'),
     scatterMarkerAttrs = scatterAttrs.marker,
     scatterMarkerLineAttrs = scatterMarkerAttrs.line;