Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add href parsing #5156

Merged
merged 8 commits into from
Aug 12, 2018
Merged

Feature/add href parsing #5156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
314dfa3
Add href support for parsing use directives (svg)
DylanPaulusSEL Aug 8, 2018
1a916cc
Add href support for parsing use directives (svg)
DylanPaulusSEL Aug 8, 2018
fd75640
Merge branch 'feature/add-href-parsing' of https://github.com/DylanPa…
DylanPaulusSEL Aug 8, 2018
0be39fd
Add href support for parsing use directives (svg)
DylanPaulusSEL Aug 8, 2018
42eff1b
Merge branch 'feature/add-href-parsing' of https://github.com/DylanPa…
DylanPaulusSEL Aug 8, 2018
41fceef
Fix linting errors
DylanPaulusSEL Aug 8, 2018
65eb8d5
add xlink:href test
asturur Aug 12, 2018
9514df7
Update parser.js
asturur Aug 12, 2018
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
5 changes: 3 additions & 2 deletions src/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@

while (nodelist.length && i < nodelist.length) {
var el = nodelist[i],
xlink = el.getAttribute('xlink:href').substr(1),
xlink = (el.getAttribute('xlink:href') || el.getAttribute('href')).substr(1),
x = el.getAttribute('x') || 0,
y = el.getAttribute('y') || 0,
el2 = elementById(doc, xlink).cloneNode(true),
Expand All @@ -487,7 +487,8 @@

for (j = 0, attrs = el.attributes, len = attrs.length; j < len; j++) {
attr = attrs.item(j);
if (attr.nodeName === 'x' || attr.nodeName === 'y' || attr.nodeName === 'xlink:href') {
if (attr.nodeName === 'x' || attr.nodeName === 'y' ||
attr.nodeName === 'xlink:href' || attr.nodeName === 'href') {
continue;
}

Expand Down
34 changes: 34 additions & 0 deletions test/unit/parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,40 @@
});
});

QUnit.test('parseSVGFromString with xlink:href', function(assert) {
var done = assert.async();
var string = '<?xml version="1.0" standalone="no"?><svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">' +
'<defs><rect id="myrect" width="300" height="100" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)"/></defs>' +
'<use xlink:href="#myrect" x="50" y="50" ></use>' +
'</svg>',
rect;

assert.ok(fabric.loadSVGFromString);

fabric.loadSVGFromString(string, function(objects) {
rect = objects[0];
assert.ok(rect instanceof fabric.Rect);
done();
});
});

QUnit.test('parseSVGFromString with href', function(assert) {
var done = assert.async();
var string = '<?xml version="1.0" standalone="no"?><svg width="100%" height="100%" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">' +
'<defs><rect id="myrect" width="300" height="100" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)"/></defs>' +
'<use href="#myrect" x="50" y="50" ></use>' +
'</svg>',
rect;

assert.ok(fabric.loadSVGFromString);

fabric.loadSVGFromString(string, function(objects) {
rect = objects[0];
assert.ok(rect instanceof fabric.Rect);
done();
});
});

QUnit.test('parseSVGFromString nested opacity', function(assert) {
var done = assert.async();
var string = '<?xml version="1.0" encoding="UTF-8"?>' +
Expand Down