fixup after merge of funnel

Author: archmoj

src/traces/bar/plot.js

@@ -516,7 +516,7 @@ function calcTextinfo(calcTrace, index, xa, ya) {
 
     function formatLabel(u) {
         var pAxis = isHorizontal ? ya : xa;
-        return tickText(pAxis, u, true).text; // TODO: may pass false here to drop the parent category?
+        return tickText(pAxis, u, true).text;
     }
 
     function formatNumber(v) {
@@ -538,8 +538,7 @@ function calcTextinfo(calcTrace, index, xa, ya) {
     }
 
     if(hasFlag('text')) {
-        tx = Lib.castOption(trace, cdi.i, 'text');
-        if(tx) text.push(tx);
+        text.push(Lib.castOption(trace, cdi.i, 'text'));
     }
 
     if(trace.type === 'waterfall') {

src/traces/funnel/defaults.js

@@ -38,11 +38,8 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 
     handleText(traceIn, traceOut, layout, coerce, false);
 
-    // TODO: move this block to bar handleText if/when textinfo implimented for bars/histograms
     if(traceOut.textposition !== 'none') {
-        var defaultTextinfo =
-            Lib.isArrayOrTypedArray(text) ? 'text+value' : 'value';
-        coerce('textinfo', defaultTextinfo);
+        coerce('textinfo', Array.isArray(text) ? 'text+value' : 'value');
     }
 
     var markerColor = coerce('marker.color', defaultColor);

src/traces/waterfall/defaults.js

@@ -51,7 +51,6 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 
     handleText(traceIn, traceOut, layout, coerce, false);
 
-    // TODO: move this block to bar handleText if/when textinfo implimented for bars/histograms
     if(traceOut.textposition !== 'none') {
         coerce('textinfo');
     }

test/image/baselines/funnel_attrs.png

@@ -1148,7 +1148,7 @@ describe('A funnel plot', function() {
             x: ['Product A', 'Product B', 'Product C'],
             y: [20, 14, 23],
             text: [20, 14, 23],
-            textinfo: 'none'
+            textinfo: 'text'
         }])
         .then(function() {
             _assertNumberOfFunnelTextNodes(3);