mv plots/plots/* to plots/* :

-  folders in plots/ are reserved for plot types

Author: etpinard

src/plotly.js

@@ -12,7 +12,7 @@ exports.MathJaxConfig = require('./fonts/mathjax_config');
 exports.defaultConfig = require('./plot_config');
 
 // plots
-exports.Plots = require('./plots/plots/plots');
+exports.Plots = require('./plots/plots');
 exports.Axes = require('./plots/cartesian/axes');
 exports.Fx = require('./plots/cartesian/graph_interact');
 exports.Scene = require('./plots/gl3d/scene');

src/plots/plots/attributes.js src/plots/attributes.jssrc/plots/plots/attributes.js renamed to src/plots/attributes.js

@@ -1,7 +1,7 @@
-var Plotly = require('../../plotly');
+var Plotly = require('../plotly');
 
 var fontAttrs = require('./font_attributes');
-var colorAttrs = require('../../components/color/attributes');
+var colorAttrs = require('../components/color/attributes');
 
 var extendFlat = Plotly.Lib.extendFlat;
 

src/plots/plots/font_attributes.js src/plots/font_attributes.jssrc/plots/plots/font_attributes.js renamed to src/plots/font_attributes.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plotly = require('../plotly');
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
@@ -703,14 +703,11 @@ plots.purge = function(gd) {
 };
 
 plots.style = function(gd) {
-    var modulesWithErrorBars = Plotly.ErrorBars ?
-            gd._modules.concat(Plotly.ErrorBars) : gd._modules,
-        i,
-        module;
+    var modulesWithErrorBars = gd._modules.concat(Plotly.ErrorBars);
 
-    for (i = 0; i < modulesWithErrorBars.length; i++) {
-        module = modulesWithErrorBars[i];
-        if (module.style) module.style(gd);
+    for(var i = 0; i < modulesWithErrorBars.length; i++) {
+        var _module = modulesWithErrorBars[i];
+        if(_module.style) _module.style(gd);
     }
 };
 

src/plots/plots/layout_attributes.js src/plots/layout_attributes.jssrc/plots/plots/layout_attributes.js renamed to src/plots/layout_attributes.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var axesAttrs = require('../cartesian/attributes');
+var axesAttrs = require('../cartesian/layout_attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
 var domainAttr = extendFlat({}, axesAttrs.domain, {