Merge pull request #1288 from plotly/sub-sup-style

alexcjohnson · web-flow · commit 74dbbc4277cf · 2017-01-09T12:01:44.000-05:00
allow style field with sub and sup in text
diff --git a/src/lib/svg_text_utils.js b/src/lib/svg_text_utils.js
@@ -335,7 +335,7 @@ function convertToSVG(_str) {
                         // most of the svg css users will care about is just like html,
                         // but font color is different. Let our users ignore this.
                         extraStyle = extraStyle[1].replace(/(^|;)\s*color:/, '$1 fill:');
-                        style = (style ? style + ';' : '') + encodeForHTML(extraStyle);
+                        style = encodeForHTML(extraStyle) + (style ? ';' + style : '');
                     }
 
                     return tspanStart + (style ? ' style="' + style + '"' : '') + '>';
diff --git a/test/image/baselines/annotations.png b/test/image/baselines/annotations.png
diff --git a/test/image/mocks/annotations.json b/test/image/mocks/annotations.json
@@ -38,7 +38,8 @@
                 "ax":-34,"ay":37,"arrowsize":2,"x":4,"y":1
             },
             {
-                "text":"All together","opacity":0.6,"arrowwidth":5,"arrowhead":3,"ax":-77,"ay":-5,
+                "text":"All together<br>with<sup style=\"font-family:raleway;fill:rgb(0,255,255)\">STYLE</sup>",
+                "opacity":0.6,"arrowwidth":5,"arrowhead":3,"ax":-77,"ay":-5,
                 "bordercolor":"rgb(255, 0, 0)","borderwidth":4,"bgcolor":"rgba(255,255,0,0.5)",
                 "font":{"color":"rgb(0, 0, 255)","size":20},
                 "arrowcolor":"rgb(166, 28, 0)","borderpad":3,"textangle":50,"x":5,"y":1

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ function convertToSVG(_str) {`
`335`	`335`	`// most of the svg css users will care about is just like html,`
`336`	`336`	`// but font color is different. Let our users ignore this.`
`337`	`337`	`extraStyle = extraStyle[1].replace(/(^\|;)\s*color:/, '$1 fill:');`
`338`		`- style = (style ? style + ';' : '') + encodeForHTML(extraStyle);`
	`338`	`+ style = encodeForHTML(extraStyle) + (style ? ';' + style : '');`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`return tspanStart + (style ? ' style="' + style + '"' : '') + '>';`