Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/lib/svg_text_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,15 @@ function buildSVGText(containerNode, str) {
}

function exitNode(type) {
// A bare closing tag can't close the root node. If we encounter this it
// means there's an extra closing tag that can just be ignored:
if(nodeStack.length === 1) {
Lib.log('Ignoring unexpected end tag </' + type + '>.', str);
return;
}

var innerNode = nodeStack.pop();

if(type !== innerNode.type) {
Lib.log('Start tag <' + innerNode.type + '> doesnt match end tag <' +
type + '>. Pretending it did match.', str);
Expand Down
14 changes: 14 additions & 0 deletions test/jasmine/tests/svg_text_utils_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,5 +371,19 @@ describe('svg+text utils', function() {
opener(2.6) + 'modified' + closer, textCase);
});
});

it('ignores bare closing tags', function() {
var node = mockTextSVGElement('</sub>');

// sub shows up as a zero-width space (u200B) on either side of the 5:
expect(node.text()).toEqual('');
});

it('ignores extra closing tags', function() {
var node = mockTextSVGElement('test<sub>5</sub></sub>more');

// sub shows up as a zero-width space (u200B) on either side of the 5:
expect(node.text()).toEqual('test\u200b5\u200bmore');
});
});
});