Replace _has<PlotType> variables with '_has()' fullLayout method

src/components/modebar/buttons.js

@@ -500,7 +500,7 @@ function toggleHover(gd) {
     var fullLayout = gd._fullLayout;
 
     var onHoverVal;
-    if(fullLayout._hasCartesian) {
+    if(fullLayout._hasCartesian && !fullLayout._hasPie) {
         onHoverVal = fullLayout._isHoriz ? 'y' : 'x';
     }
     else onHoverVal = 'closest';

src/plot_api/plot_api.js

@@ -205,7 +205,7 @@ Plotly.plot = function(gd, data, layout, config) {
         if(!recalc) return;
 
         var subplots = Plots.getSubplotIds(fullLayout, 'cartesian'),
-            modules = gd._modules;
+            modules = fullLayout._modules;
 
         // position and range calculations for traces that
         // depend on each other ie bars (stacked or grouped)

src/plots/cartesian/graph_interact.js

@@ -60,7 +60,7 @@ fx.supplyLayoutDefaults = function(layoutIn, layoutOut, fullData) {
     coerce('dragmode');
 
     var hovermodeDflt;
-    if(layoutOut._hasCartesian) {
+    if(layoutOut._hasCartesian && !layoutOut._hasPie) {
         // flag for 'horizontal' plots:
         // determines the state of the mode bar 'compare' hovermode button
         var isHoriz = layoutOut._isHoriz = fx.isHoriz(fullData);

src/plots/cartesian/index.js

@@ -30,7 +30,7 @@ exports.plot = function(gd) {
     var fullLayout = gd._fullLayout,
         subplots = Plots.getSubplotIds(fullLayout, 'cartesian'),
         calcdata = gd.calcdata,
-        modules = gd._modules;
+        modules = fullLayout._modules;
 
     function getCdSubplot(calcdata, subplot) {
         var cdSubplot = [];

src/plots/layout_attributes.js

@@ -168,30 +168,7 @@ module.exports = {
         role: 'info',
         description: 'Determines whether or not a legend is drawn.'
     },
-    _hasCartesian: {
-        valType: 'boolean',
-        dflt: false
-    },
-    _hasGL3D: {
-        valType: 'boolean',
-        dflt: false
-    },
-    _hasGeo: {
-        valType: 'boolean',
-        dflt: false
-    },
-    _hasPie: {
-        valType: 'boolean',
-        dflt: false
-    },
-    _hasGL2D: {
-        valType: 'boolean',
-        dflt: false
-    },
-    _hasTernary: {
-        valType: 'boolean',
-        dflt: false
-    },
+
     _composedModules: {
         '*': 'Fx'
     },

src/plots/plots.js

@@ -193,7 +193,7 @@ plots.getSubplotIds = function getSubplotIds(layout, type) {
     if(type === 'cartesian' && !layout._hasCartesian) return [];
     if(type === 'gl2d' && !layout._hasGL2D) return [];
     if(type === 'cartesian' || type === 'gl2d') {
-        return Object.keys(layout._plots);
+        return Object.keys(layout._plots || {});
     }
 
     var idRegex = _module.idRegex,
@@ -435,22 +435,29 @@ plots.sendDataToCloud = function(gd) {
     return false;
 };
 
+// Fill in default values:
+//
+// gd.data, gd.layout:
+//   are precisely what the user specified
+//
+// gd._fullData, gd._fullLayout:
+//   are complete descriptions of how to draw the plot
+//
+// gd._fullLayout._modules
+//   is a list of all the trace modules required to draw the plot
+//
 plots.supplyDefaults = function(gd) {
-    // fill in default values:
-    // gd.data, gd.layout:
-    //   are precisely what the user specified
-    // gd._fullData, gd._fullLayout:
-    //   are complete descriptions of how to draw the plot
     var oldFullLayout = gd._fullLayout || {},
         newFullLayout = gd._fullLayout = {},
-        newLayout = gd.layout || {},
-        oldFullData = gd._fullData || [],
+        newLayout = gd.layout || {};
+
+    var oldFullData = gd._fullData || [],
         newFullData = gd._fullData = [],
-        newData = gd.data || [],
-        modules = gd._modules = [];
+        newData = gd.data || [];
 
-    var i, trace, fullTrace, _module, axList, ax;
+    var modules = newFullLayout._modules = [];
 
+    var i, _module;
 
     // first fill in what we can of layout without looking at data
     // because fullData needs a few things from layout
@@ -461,24 +468,28 @@ plots.supplyDefaults = function(gd) {
 
     // then do the data
     for(i = 0; i < newData.length; i++) {
-        trace = newData[i];
-
-        fullTrace = plots.supplyDataDefaults(trace, i, newFullLayout);
+        var fullTrace = plots.supplyDataDefaults(newData[i], i, newFullLayout);
         newFullData.push(fullTrace);
 
-        // detect plot type
-        if(plots.traceIs(fullTrace, 'cartesian')) newFullLayout._hasCartesian = true;
-        else if(plots.traceIs(fullTrace, 'gl3d')) newFullLayout._hasGL3D = true;
-        else if(plots.traceIs(fullTrace, 'geo')) newFullLayout._hasGeo = true;
-        else if(plots.traceIs(fullTrace, 'pie')) newFullLayout._hasPie = true;
-        else if(plots.traceIs(fullTrace, 'gl2d')) newFullLayout._hasGL2D = true;
-        else if(plots.traceIs(fullTrace, 'ternary')) newFullLayout._hasTernary = true;
-        else if('r' in fullTrace) newFullLayout._hasPolar = true;
+        // 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 && modules.indexOf(_module) === -1) modules.push(_module);
     }
 
+    // attach helper method
+    newFullLayout._has = hasPlotType.bind(newFullLayout);
+
+    // temporary block (before replace all _has??? with _hasPlotType() ?
+    newFullLayout._hasCartesian = newFullLayout._has('cartesian');
+    newFullLayout._hasGeo = newFullLayout._has('geo');
+    newFullLayout._hasGL3D = newFullLayout._has('gl3d');
+    newFullLayout._hasGL2D = newFullLayout._has('gl2d');
+    newFullLayout._hasTernary = newFullLayout._has('ternary');
+    newFullLayout._hasPie = newFullLayout._has('pie');
+
     // special cases that introduce interactions between traces
     for(i = 0; i < modules.length; i++) {
         _module = modules[i];
@@ -497,32 +508,46 @@ plots.supplyDefaults = function(gd) {
     // clean subplots and other artifacts from previous plot calls
     plots.cleanPlot(newFullData, newFullLayout, oldFullData, oldFullLayout);
 
-    /*
-     * Relink functions and underscore attributes to promote consistency between
-     * plots.
-     */
+    // relink functions and _ attributes to promote consistency between plots
     relinkPrivateKeys(newFullLayout, oldFullLayout);
 
     plots.doAutoMargin(gd);
 
     // can't quite figure out how to get rid of this... each axis needs
     // a reference back to the DOM object for just a few purposes
-    axList = Plotly.Axes.list(gd);
+    var axList = Plotly.Axes.list(gd);
     for(i = 0; i < axList.length; i++) {
-        ax = axList[i];
+        var ax = axList[i];
         ax._gd = gd;
         ax.setScale();
     }
 
     // update object references in calcdata
     if((gd.calcdata || []).length === newFullData.length) {
         for(i = 0; i < newFullData.length; i++) {
-            trace = newFullData[i];
+            var trace = newFullData[i];
             (gd.calcdata[i][0] || {}).trace = trace;
         }
     }
 };
 
+// helper function to be bound to fullLayout to check
+// whether a certain plot type or layout categories is present on plot
+function hasPlotType(category) {
+    var modules = this._modules || [];
+
+    for(var i = 0; i < modules.length; i++) {
+        var _module = modules[i];
+
+        if(_module.basePlotModule.name === category) return true;
+
+        var layoutCategories = _module.layoutCategories || [];
+        if(layoutCategories.indexOf(category) !== -1) return true;
+    }
+
+    return false;
+}
+
 plots.cleanPlot = function(newFullData, newFullLayout, oldFullData, oldFullLayout) {
     var i, j;
 
@@ -713,18 +738,12 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut) {
     coerce('separators');
     coerce('hidesources');
     coerce('smith');
-    coerce('_hasCartesian');
-    coerce('_hasGL3D');
-    coerce('_hasGeo');
-    coerce('_hasPie');
-    coerce('_hasGL2D');
-    coerce('_hasTernary');
 };
 
 plots.supplyLayoutModuleDefaults = function(layoutIn, layoutOut, fullData) {
     var i, _module;
 
-    // TODO incorporate into subplotRegistry
+    // TODO incorporate into subplotsRegistry
     Plotly.Axes.supplyLayoutDefaults(layoutIn, layoutOut, fullData);
 
     // plot module layout defaults
@@ -792,7 +811,6 @@ plots.purge = function(gd) {
 
     // these get recreated on Plotly.plot anyway, but just to be safe
     // (and to have a record of them...)
-    delete gd._modules;
     delete gd._tester;
     delete gd._testref;
     delete gd._promises;
@@ -810,7 +828,7 @@ plots.purge = function(gd) {
 };
 
 plots.style = function(gd) {
-    var _modules = gd._modules;
+    var _modules = gd._fullLayout._modules;
 
     for(var i = 0; i < _modules.length; i++) {
         var _module = _modules[i];

src/traces/pie/index.js

@@ -23,6 +23,7 @@ Pie.moduleType = 'trace';
 Pie.name = 'pie';
 Pie.basePlotModule = require('../../plots/cartesian');
 Pie.categories = ['pie', 'showLegend'];
+Pie.layoutCategories = ['pie'];
 Pie.meta = {
     description: [
         'A data visualized by the sectors of the pie is set in `values`.',

src/traces/scatterternary/style.js

@@ -12,13 +12,16 @@
 var scatterStyle = require('../scatter/style');
 
 
-module.exports = function style(graphDiv) {
-    for(var i = 0; i < graphDiv._modules.length; i++) {
-        // we're just going to call scatter style... if we already
-        // called it, don't need to redo.
-        // Later though we may want differences, or we may make style
-        // more specific in its scope, then we can remove this.
-        if(graphDiv._modules[i].name === 'scatter') return;
+module.exports = function style(gd) {
+    var modules = gd._fullLayout._modules;
+
+    // we're just going to call scatter style... if we already
+    // called it, don't need to redo.
+    // Later though we may want differences, or we may make style
+    // more specific in its scope, then we can remove this.
+    for(var i = 0; i < modules.length; i++) {
+        if(modules[i].name === 'scatter') return;
     }
-    scatterStyle(graphDiv);
+
+    scatterStyle(gd);
 };

test/jasmine/tests/plots_test.js

@@ -351,7 +351,6 @@ describe('Test Plots', function() {
             expect(gd.undonum).toBeUndefined();
             expect(gd.autoplay).toBeUndefined();
             expect(gd.changed).toBeUndefined();
-            expect(gd._modules).toBeUndefined();
             expect(gd._tester).toBeUndefined();
             expect(gd._testref).toBeUndefined();
             expect(gd._promises).toBeUndefined();