zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert style to attributes, but check xlink:href target outside the attribute loop 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1284 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2010-01-27 16:42:35 +00:00
parent ec1ab246d1
commit 3eb89914b6
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editor/svgcanvas.js
View File

@ -1134,17 +1134,6 @@ function BatchCommand(text) {
// Convert to absolute
node.setAttribute('d',pathActions.convertPath(node));
}
// for filters, uses and gradients, ensure the xlink:href refers to a local element
if($.inArray(node.nodeName, ["filter", "use", "linearGradient", "radialGradient"]) != -1 &&
attr.localName == "href" && attr.namespaceURI == xlinkns)
{
// TODO: we simply check if the first character is a #, is this bullet-proof?
if (attr.nodeValue[0] != "#") {
// just delete the element and return immediately (toss out children)
parent.removeChild(node);
return;
}
}
// for the style attribute, rewrite it in terms of XML presentational attributes
if (attrName == "style") {
var props = attr.nodeValue.split(";"),
@ -1158,6 +1147,18 @@ function BatchCommand(text) {
}
}
}
// for filters, uses and gradients, ensure the xlink:href refers to a local element
var href = node.getAttributeNS(xlinkns,"href");
if(href &&
$.inArray(node.nodeName, ["filter", "use", "linearGradient", "radialGradient"]) != -1)
{
// TODO: we simply check if the first character is a #, is this bullet-proof?
if (href[0] != "#") {
// just delete the element and return immediately (toss out children)
parent.removeChild(node);
return;
}
}
// recurse to children
i = node.childNodes.length;