clean up some deleted code and overcomplicated logic

Author: alexcjohnson

src/traces/contour/constraint_value_defaults.js

@@ -9,7 +9,6 @@
 
 'use strict';
 
-// var constraintMapping = require('./constraint_mapping');
 var isNumeric = require('fast-isnumeric');
 var COMPARISON_OPS2 = require('../../constants/filter_ops').COMPARISON_OPS2;
 

src/traces/contour/defaults.js

@@ -17,7 +17,6 @@ var handleConstraintDefaults = require('./constraint_defaults');
 var handleContoursDefaults = require('./contours_defaults');
 var handleStyleDefaults = require('./style_defaults');
 var attributes = require('./attributes');
-var plotAttributes = require('../../plots/attributes');
 
 
 module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
@@ -39,10 +38,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var isConstraint = (coerce('contours.type') === 'constraint');
     coerce('connectgaps', hasColumns(traceOut));
 
-    // Override the trace-level showlegend default with a default that takes
-    // into account whether this is a constraint or level contours:
-    if(isConstraint) Lib.coerce(traceIn, traceOut, plotAttributes, 'showlegend');
-    else delete traceOut.showlegend;
+    // trace-level showlegend has already been set, but is only allowed if this is a constraint
+    if(!isConstraint) delete traceOut.showlegend;
 
     if(isConstraint) {
         handleConstraintDefaults(traceIn, traceOut, coerce, layout, defaultColor);

src/traces/contour/style_defaults.js

@@ -10,7 +10,6 @@
 'use strict';
 
 var colorscaleDefaults = require('../../components/colorscale/defaults');
-// var Lib = require('../../lib');
 var handleLabelDefaults = require('./label_defaults');
 
 

src/traces/contourcarpet/defaults.js

@@ -16,7 +16,6 @@ var attributes = require('./attributes');
 var handleConstraintDefaults = require('../contour/constraint_defaults');
 var handleContoursDefaults = require('../contour/contours_defaults');
 var handleStyleDefaults = require('../contour/style_defaults');
-var plotAttributes = require('../../plots/attributes');
 
 module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     function coerce(attr, dflt) {
@@ -59,10 +58,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         // Unimplemented:
         // coerce('connectgaps', hasColumns(traceOut));
 
-        // Override the trace-level showlegend default with a default that takes
-        // into account whether this is a constraint or level contours:
-        if(isConstraint) Lib.coerce(traceIn, traceOut, plotAttributes, 'showlegend');
-        else delete traceOut.showlegend;
+        // trace-level showlegend has already been set, but is only allowed if this is a constraint
+        if(!isConstraint) delete traceOut.showlegend;
 
         if(isConstraint) {
             handleConstraintDefaults(traceIn, traceOut, coerce, layout, defaultColor, {hasHover: false});