Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-30 01:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1425 from asturur/use-tag-use

Browse source 
Support use tag
This commit is contained in:
Juriy Zaytsev 2014-06-25 12:25:06 +02:00
commit 0f2e306a64
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/parser.js
View file

@ -363,6 +363,35 @@
return styles;
}
/**
* @private
*/
function parseUseDirectives(doc) {
var nodelist = doc.querySelectorAll("use");
for (var i = 0; i < nodelist.length; i++) {
var el = nodelist[i];
var xlink = el.getAttribute('xlink:href').substr(1);
var x = el.getAttribute('x') || 0;
var y = el.getAttribute('y') || 0;
var el2 = doc.getElementById(xlink).cloneNode(true);
var currentTrans = (el.getAttribute('transform') || '') + ' translate(' + x + ', ' + y + ')';
for (var j = 0, attrs = el.attributes, l = attrs.length; j < l; j++) {
var attr = attrs.item(j);
if (attr.nodeName !== 'x' && attr.nodeName !== 'y' && attr.nodeName !== 'xlink:href') {
if (attr.nodeName === 'transform') {
currentTrans = currentTrans + ' ' + attr.nodeValue;
} else {
el2.setAttribute(attr.nodeName, attr.nodeValue);
}
}
}
el2.setAttribute('transform', currentTrans);
el2.removeAttribute('id');
var pNode=el.parentNode;
pNode.replaceChild(el2, el);
}
}
/**
* Parses an SVG document, converts it to an array of corresponding fabric.* instances and passes them to a callback
@ -403,9 +432,11 @@
return function(doc, callback, reviver) {
if (!doc) return;
var startTime = new Date(),
descendants = fabric.util.toArray(doc.getElementsByTagName('*'));
var startTime = new Date();
parseUseDirectives(doc);
var descendants = fabric.util.toArray(doc.getElementsByTagName('*'));
if (descendants.length === 0 && fabric.isLikelyNode) {
// we're likely in node, where "o3-xml" library fails to gEBTN("*")
@ -464,7 +495,6 @@
fabric.gradientDefs = fabric.getGradientDefs(doc);
fabric.cssRules = fabric.getCSSRules(doc);
// Precedence of rules: style > class > attribute
fabric.parseElements(elements, function(instances) {
@ -776,7 +806,6 @@
loadSVGFromURL: function(url, callback, reviver) {
url = url.replace(/^\n\s*/, '').trim();
svgCache.has(url, function (hasUrl) {
if (hasUrl) {
svgCache.get(url, function (value) {