drop pattern from funnel marker

Author: archmoj

src/traces/funnel/attributes.js

@@ -7,6 +7,7 @@ var hovertemplateAttrs = require('../../plots/template_attributes').hovertemplat
 var texttemplateAttrs = require('../../plots/template_attributes').texttemplateAttrs;
 var constants = require('./constants');
 var extendFlat = require('../../lib/extend').extendFlat;
+var extendDeep = require('../../lib/extend').extendDeep;
 var Color = require('../../components/color');
 
 module.exports = {
@@ -75,7 +76,7 @@ module.exports = {
     offset: extendFlat({}, barAttrs.offset, {arrayOk: false}),
     width: extendFlat({}, barAttrs.width, {arrayOk: false}),
 
-    marker: barAttrs.marker,
+    marker: funnelMarker(),
 
     connector: {
         fillcolor: {
@@ -108,3 +109,9 @@ module.exports = {
     offsetgroup: barAttrs.offsetgroup,
     alignmentgroup: barAttrs.alignmentgroup
 };
+
+function funnelMarker() {
+    var marker = extendDeep({}, barAttrs.marker);
+    delete marker.pattern;
+    return marker;
+}

src/traces/funnel/defaults.js

@@ -48,7 +48,6 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     var markerColor = coerce('marker.color', defaultColor);
     coerce('marker.line.color', Color.defaultLine);
     coerce('marker.line.width');
-    Lib.coercePattern(coerce, 'marker.pattern');
 
     var connectorVisible = coerce('connector.visible');
     if(connectorVisible) {

src/traces/funnel/style.js

@@ -31,7 +31,6 @@ function style(gd, cd, sel) {
             }
         });
 
-        Drawing.pointStyle(gTrace.selectAll('path'), trace, gd);
         styleTextPoints(gTrace, trace, gd);
 
         gTrace.selectAll('.regions').each(function() {