improved coerce behavior

Author: emilykl

src/components/shapes/defaults.js

@@ -128,8 +128,9 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
 
     // Label options
     var isLine = shapeType === 'line';
-    var labelText = coerce('label.text');
-    var labelTextTemplate = coerce('label.texttemplate');
+    var labelTextTemplate, labelText;
+    if(noPath) { labelTextTemplate = coerce('label.texttemplate'); }
+    if(!labelTextTemplate) { labelText = coerce('label.text'); }
     if(labelText || labelTextTemplate) {
         coerce('label.textangle');
         var labelTextPosition = coerce('label.textposition', isLine ? 'middle' : 'middle center');

src/components/shapes/draw.js

@@ -611,21 +611,23 @@ function drawLabel(gd, index, options, shapeGroup) {
     if(!(options.label.text || options.label.texttemplate)) return;
 
     // Text template overrides text
-    var text = options.label.text;
+    var text;
     if(options.label.texttemplate) {
         var templateValues = {};
         if(options.type !== 'path') {
             var _xa = Axes.getFromId(gd, options.xref);
             var _ya = Axes.getFromId(gd, options.yref);
-            Object.keys(shapeLabelTexttemplateVars).forEach(function(key) {
+            for(var key in shapeLabelTexttemplateVars) {
                 var val = shapeLabelTexttemplateVars[key](options, _xa, _ya);
                 if(val !== undefined) templateValues[key] = val;
-            });
+            }
         }
         text = Lib.texttemplateStringForShapes(options.label.texttemplate,
             {},
             gd._fullLayout._d3locale,
             templateValues);
+    } else {
+        text = options.label.text;
     }
 
     var labelGroupAttrs = {