try on ci

etpinard · etpinard · commit b018b8a5607a · 2016-05-03T17:03:13.000-04:00
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -335,6 +335,12 @@ lib.noneOrAll = function(containerIn, containerOut, attrList) {
     }
 };
 
+lib.fillUnique = function(arr, item) {
+    if(item && arr.indexOf(arr) === -1) arr.push(item);
+
+    return arr;
+}
+
 lib.mergeArray = function(traceAttr, cd, cdAttr) {
     if(Array.isArray(traceAttr)) {
         var imax = Math.min(traceAttr.length, cd.length);
diff --git a/src/plots/cartesian/layout_defaults.js b/src/plots/cartesian/layout_defaults.js
@@ -95,7 +95,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
     // make sure that plots with orphan cartesian axes
     // are considered 'cartesian'
     if(xaListCartesian.length && yaListCartesian.length) {
-        layoutOut._hasCartesian = true;
+        Lib.fillUnique(layoutOut._basePlotModules, Plots.subplotsRegistry.cartesian);
     }
 
     function axSort(a, b) {
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -446,6 +446,9 @@ plots.sendDataToCloud = function(gd) {
 // gd._fullLayout._modules
 //   is a list of all the trace modules required to draw the plot
 //
+// gd._fullLayout._basePlotModules
+//   is a list of all the plot modules required to draw the plot
+//
 plots.supplyDefaults = function(gd) {
     var oldFullLayout = gd._fullLayout || {},
         newFullLayout = gd._fullLayout = {},
@@ -455,7 +458,8 @@ plots.supplyDefaults = function(gd) {
         newFullData = gd._fullData = [],
         newData = gd.data || [];
 
-    var modules = newFullLayout._modules = [];
+    var modules = newFullLayout._modules = [],
+        basePlotModules = newFullLayout._basePlotModules = [];
 
     var i, _module;
 
@@ -474,9 +478,12 @@ plots.supplyDefaults = function(gd) {
         // detect polar
         if('r' in fullTrace) newFullLayout._hasPolar = true;
 
-        // fill in modules list
         _module = fullTrace._module;
-        if(_module && modules.indexOf(_module) === -1) modules.push(_module);
+        if(!_module) continue;
+
+        // fill in module lists
+        Lib.fillUnique(modules, _module);
+        Lib.fillUnique(basePlotModules, fullTrace._module.basePlotModule);
     }
 
     // attach helper method
@@ -740,13 +747,17 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {
 plots.supplyLayoutModuleDefaults = function(layoutIn, layoutOut, fullData) {
     var i, _module;
 
-    // TODO incorporate into subplotsRegistry
+    // can't be be part of basePlotModules loop 
+    // in order to handle the orphan axes case
     Plotly.Axes.supplyLayoutDefaults(layoutIn, layoutOut, fullData);
 
-    // plot module layout defaults
-    var plotTypes = Object.keys(subplotsRegistry);
-    for(i = 0; i < plotTypes.length; i++) {
-        _module = subplotsRegistry[plotTypes[i]];
+    // base plot module layout defaults
+    var basePlotModules = layoutOut._basePlotModules;
+    for(i = 0; i < basePlotModules.length; i++) {
+        _module = basePlotModules[i];
+
+        // done above already
+        if(_module.name === 'cartesian') continue;
 
         // e.g. gl2d does not have a layout-defaults step
         if(_module.supplyLayoutDefaults) {
@@ -755,9 +766,9 @@ plots.supplyLayoutModuleDefaults = function(layoutIn, layoutOut, fullData) {
     }
 
     // trace module layout defaults
-    var traceTypes = Object.keys(modules);
-    for(i = 0; i < traceTypes.length; i++) {
-        _module = modules[allTypes[i]]._module;
+    var modules = layoutOut._modules
+    for(i = 0; i < modules.length; i++) {
+        _module = modules[i];
 
         if(_module.supplyLayoutDefaults) {
             _module.supplyLayoutDefaults(layoutIn, layoutOut, fullData);

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {`
`95`	`95`	`// make sure that plots with orphan cartesian axes`
`96`	`96`	`// are considered 'cartesian'`
`97`	`97`	`if(xaListCartesian.length && yaListCartesian.length) {`
`98`		`- layoutOut._hasCartesian = true;`
	`98`	`+ Lib.fillUnique(layoutOut._basePlotModules, Plots.subplotsRegistry.cartesian);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`function axSort(a, b) {`