Merge branch 'master' into texttemplate

antoinerg · antoinerg · commit 2528aa688c85 · 2019-08-14T12:07:12.000-04:00
diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js
@@ -132,7 +132,7 @@ function convertTextStyle(trace, gd) {
             }
         }
     } else {
-        if(trace.text.length < count) {
+        if(Array.isArray(trace.text) && trace.text.length < count) {
             // if text array is shorter, we'll need to append to it, so let's slice to prevent mutating
             optsOut.text = trace.text.slice();
         } else {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ function convertTextStyle(trace, gd) {`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`} else {`
`135`		`- if(trace.text.length < count) {`
	`135`	`+ if(Array.isArray(trace.text) && trace.text.length < count) {`
`136`	`136`	`// if text array is shorter, we'll need to append to it, so let's slice to prevent mutating`
`137`	`137`	`optsOut.text = trace.text.slice();`
`138`	`138`	`} else {`