dont coerce waterfall textinfo if textposition is none

Author: archmoj

src/traces/bar/plot.js

@@ -475,7 +475,7 @@ function getText(calcTrace, index, xa, ya) {
     var trace = calcTrace[0].trace;
 
     var value;
-    if(!trace.textinfo || trace.textinfo === 'none') {
+    if(!trace.textinfo) {
         value = helpers.getValue(trace.text, index);
     } else {
         value = calcTextinfo(calcTrace, index, xa, ya);

src/traces/waterfall/defaults.js

@@ -45,13 +45,17 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     coerce('width');
 
     coerce('text');
-    coerce('textinfo');
 
     coerce('hovertext');
     coerce('hovertemplate');
 
     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');
+    }
+
     handleDirection(coerce, 'increasing', INCREASING_COLOR);
     handleDirection(coerce, 'decreasing', DECREASING_COLOR);
     handleDirection(coerce, 'totals', TOTALS_COLOR);