Skip to content

Commit cbd6b87

Browse files
authored
Merge pull request #1089 from monfera/multiline
Multiline gl2d texts
2 parents 4886d94 + 7f47de1 commit cbd6b87

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"gl-line3d": "^1.1.0",
6767
"gl-mat4": "^1.1.2",
6868
"gl-mesh3d": "^1.2.0",
69-
"gl-plot2d": "^1.1.9",
69+
"gl-plot2d": "^1.2.0",
7070
"gl-plot3d": "^1.5.1",
7171
"gl-pointcloud2d": "^1.0.0",
7272
"gl-scatter2d": "^1.2.0",

Diff for: src/plots/gl2d/scene2d.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,8 @@ proto.computeTickMarks = function() {
249249

250250
for(var j = 0; j < 2; ++j) {
251251
for(var i = 0; i < nextTicks[j].length; ++i) {
252-
// TODO add support for '\n' in gl-plot2d,
253-
// For now, replace '\n' with ' '
254-
nextTicks[j][i].text = convertHTMLToUnicode(nextTicks[j][i].text + '').replace(/\n/g, ' ');
252+
// coercing tick value (may not be a string) to a string
253+
nextTicks[j][i].text = convertHTMLToUnicode(nextTicks[j][i].text + '');
255254
}
256255
}
257256

Diff for: test/image/baselines/gl2d_date_axes.png

116 Bytes
Loading

0 commit comments

Comments
 (0)