github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #296 from paulkaplan/fix-escaping

Browse Source 
Remove duplicate xml escaping
This commit is contained in:
Paul Kaplan
2018-05-29 16:18:31 -04:00
committed by GitHub
parent 7f53a4a19e 44c30d76ad
commit d7e39a35d7
6 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/svg-text-bubble.js
View File

@@ -169,12 +169,16 @@ class SVGTextBubble {
return svgString;
}
_buildTextFragment (text) {
const textNode = this.svgTextWrapper.wrapText(MAX_LINE_LENGTH, text);
const serializer = new XMLSerializer();
return serializer.serializeToString(textNode);
}
buildString (type, text, pointsLeft) {
this.type = type;
this.pointsLeft = pointsLeft;
const textNode = this.svgTextWrapper.wrapText(MAX_LINE_LENGTH, text);
const serializer = new XMLSerializer();
this._textFragment = serializer.serializeToString(textNode);
this._textFragment = this._buildTextFragment(text);
let fragment = '';

3
src/util/svg-text-wrapper.js
View File

@@ -1,5 +1,4 @@
const TextWrapper = require('./text-wrapper');
const xmlescape = require('xml-escape');
/**
* Measure text by using a hidden SVG attached to the DOM.
@@ -118,7 +117,7 @@ class SVGTextWrapper extends TextWrapper {
const tspanNode = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
tspanNode.setAttribute('x', '0');
tspanNode.setAttribute('dy', '1.2em');
tspanNode.textContent = xmlescape(line);
tspanNode.textContent = line;
textElement.appendChild(tspanNode);
}
return textElement;