From 00043ff56a7b740070eb64eeeb971d02d35f6576 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 26 Feb 2013 15:21:46 +0000 Subject: [PATCH] use 2 spaces for indentation in sanitize.js See r2469 and https://groups.google.com/d/topic/svg-edit/fKGQEZ6h7-g/ git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2471 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/sanitize.js | 404 ++++++++++++++++++++++----------------------- 1 file changed, 202 insertions(+), 202 deletions(-) diff --git a/editor/sanitize.js b/editor/sanitize.js index 3be6dfd7..4839809c 100644 --- a/editor/sanitize.js +++ b/editor/sanitize.js @@ -15,95 +15,95 @@ (function() { if (!svgedit.sanitize) { - svgedit.sanitize = {}; + svgedit.sanitize = {}; } var NS = svgedit.NS, - REVERSE_NS = svgedit.getReverseNS(); + REVERSE_NS = svgedit.getReverseNS(); // this defines which elements and attributes that we support var svgWhiteList_ = { - // SVG Elements - "a": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "xlink:href", "xlink:title"], - "circle": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "r", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], - "clipPath": ["class", "clipPathUnits", "id"], - "defs": [], - "style" : ["type"], - "desc": [], - "ellipse": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], - "feGaussianBlur": ["class", "color-interpolation-filters", "id", "requiredFeatures", "stdDeviation"], - "filter": ["class", "color-interpolation-filters", "filterRes", "filterUnits", "height", "id", "primitiveUnits", "requiredFeatures", "width", "x", "xlink:href", "y"], - "foreignObject": ["class", "font-size", "height", "id", "opacity", "requiredFeatures", "style", "transform", "width", "x", "y"], - "g": ["class", "clip-path", "clip-rule", "id", "display", "fill", "fill-opacity", "fill-rule", "filter", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "font-family", "font-size", "font-style", "font-weight", "text-anchor"], - "image": ["class", "clip-path", "clip-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "style", "systemLanguage", "transform", "width", "x", "xlink:href", "xlink:title", "y"], - "line": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "x1", "x2", "y1", "y2"], - "linearGradient": ["class", "id", "gradientTransform", "gradientUnits", "requiredFeatures", "spreadMethod", "systemLanguage", "x1", "x2", "xlink:href", "y1", "y2"], - "marker": ["id", "class", "markerHeight", "markerUnits", "markerWidth", "orient", "preserveAspectRatio", "refX", "refY", "systemLanguage", "viewBox"], - "mask": ["class", "height", "id", "maskContentUnits", "maskUnits", "width", "x", "y"], - "metadata": ["class", "id"], - "path": ["class", "clip-path", "clip-rule", "d", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], - "pattern": ["class", "height", "id", "patternContentUnits", "patternTransform", "patternUnits", "requiredFeatures", "style", "systemLanguage", "viewBox", "width", "x", "xlink:href", "y"], - "polygon": ["class", "clip-path", "clip-rule", "id", "fill", "fill-opacity", "fill-rule", "filter", "id", "class", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "points", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], - "polyline": ["class", "clip-path", "clip-rule", "id", "fill", "fill-opacity", "fill-rule", "filter", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "points", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], - "radialGradient": ["class", "cx", "cy", "fx", "fy", "gradientTransform", "gradientUnits", "id", "r", "requiredFeatures", "spreadMethod", "systemLanguage", "xlink:href"], - "rect": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "width", "x", "y"], - "stop": ["class", "id", "offset", "requiredFeatures", "stop-color", "stop-opacity", "style", "systemLanguage"], - "svg": ["class", "clip-path", "clip-rule", "filter", "id", "height", "mask", "preserveAspectRatio", "requiredFeatures", "style", "systemLanguage", "viewBox", "width", "x", "xmlns", "xmlns:se", "xmlns:xlink", "y"], - "switch": ["class", "id", "requiredFeatures", "systemLanguage"], - "symbol": ["class", "fill", "fill-opacity", "fill-rule", "filter", "font-family", "font-size", "font-style", "font-weight", "id", "opacity", "preserveAspectRatio", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "viewBox"], - "text": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "font-family", "font-size", "font-style", "font-weight", "id", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "text-anchor", "transform", "x", "xml:space", "y"], - "textPath": ["class", "id", "method", "requiredFeatures", "spacing", "startOffset", "style", "systemLanguage", "transform", "xlink:href"], - "title": [], - "tspan": ["class", "clip-path", "clip-rule", "dx", "dy", "fill", "fill-opacity", "fill-rule", "filter", "font-family", "font-size", "font-style", "font-weight", "id", "mask", "opacity", "requiredFeatures", "rotate", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "text-anchor", "textLength", "transform", "x", "xml:space", "y"], - "use": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "height", "id", "mask", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "transform", "width", "x", "xlink:href", "y"], + // SVG Elements + "a": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "xlink:href", "xlink:title"], + "circle": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "r", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], + "clipPath": ["class", "clipPathUnits", "id"], + "defs": [], + "style" : ["type"], + "desc": [], + "ellipse": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], + "feGaussianBlur": ["class", "color-interpolation-filters", "id", "requiredFeatures", "stdDeviation"], + "filter": ["class", "color-interpolation-filters", "filterRes", "filterUnits", "height", "id", "primitiveUnits", "requiredFeatures", "width", "x", "xlink:href", "y"], + "foreignObject": ["class", "font-size", "height", "id", "opacity", "requiredFeatures", "style", "transform", "width", "x", "y"], + "g": ["class", "clip-path", "clip-rule", "id", "display", "fill", "fill-opacity", "fill-rule", "filter", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "font-family", "font-size", "font-style", "font-weight", "text-anchor"], + "image": ["class", "clip-path", "clip-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "style", "systemLanguage", "transform", "width", "x", "xlink:href", "xlink:title", "y"], + "line": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "x1", "x2", "y1", "y2"], + "linearGradient": ["class", "id", "gradientTransform", "gradientUnits", "requiredFeatures", "spreadMethod", "systemLanguage", "x1", "x2", "xlink:href", "y1", "y2"], + "marker": ["id", "class", "markerHeight", "markerUnits", "markerWidth", "orient", "preserveAspectRatio", "refX", "refY", "systemLanguage", "viewBox"], + "mask": ["class", "height", "id", "maskContentUnits", "maskUnits", "width", "x", "y"], + "metadata": ["class", "id"], + "path": ["class", "clip-path", "clip-rule", "d", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], + "pattern": ["class", "height", "id", "patternContentUnits", "patternTransform", "patternUnits", "requiredFeatures", "style", "systemLanguage", "viewBox", "width", "x", "xlink:href", "y"], + "polygon": ["class", "clip-path", "clip-rule", "id", "fill", "fill-opacity", "fill-rule", "filter", "id", "class", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "points", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], + "polyline": ["class", "clip-path", "clip-rule", "id", "fill", "fill-opacity", "fill-rule", "filter", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "points", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], + "radialGradient": ["class", "cx", "cy", "fx", "fy", "gradientTransform", "gradientUnits", "id", "r", "requiredFeatures", "spreadMethod", "systemLanguage", "xlink:href"], + "rect": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "width", "x", "y"], + "stop": ["class", "id", "offset", "requiredFeatures", "stop-color", "stop-opacity", "style", "systemLanguage"], + "svg": ["class", "clip-path", "clip-rule", "filter", "id", "height", "mask", "preserveAspectRatio", "requiredFeatures", "style", "systemLanguage", "viewBox", "width", "x", "xmlns", "xmlns:se", "xmlns:xlink", "y"], + "switch": ["class", "id", "requiredFeatures", "systemLanguage"], + "symbol": ["class", "fill", "fill-opacity", "fill-rule", "filter", "font-family", "font-size", "font-style", "font-weight", "id", "opacity", "preserveAspectRatio", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "viewBox"], + "text": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "font-family", "font-size", "font-style", "font-weight", "id", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "text-anchor", "transform", "x", "xml:space", "y"], + "textPath": ["class", "id", "method", "requiredFeatures", "spacing", "startOffset", "style", "systemLanguage", "transform", "xlink:href"], + "title": [], + "tspan": ["class", "clip-path", "clip-rule", "dx", "dy", "fill", "fill-opacity", "fill-rule", "filter", "font-family", "font-size", "font-style", "font-weight", "id", "mask", "opacity", "requiredFeatures", "rotate", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "text-anchor", "textLength", "transform", "x", "xml:space", "y"], + "use": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "height", "id", "mask", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "transform", "width", "x", "xlink:href", "y"], - // MathML Elements - "annotation": ["encoding"], - "annotation-xml": ["encoding"], - "maction": ["actiontype", "other", "selection"], - "math": ["class", "id", "display", "xmlns"], - "menclose": ["notation"], - "merror": [], - "mfrac": ["linethickness"], - "mi": ["mathvariant"], - "mmultiscripts": [], - "mn": [], - "mo": ["fence", "lspace", "maxsize", "minsize", "rspace", "stretchy"], - "mover": [], - "mpadded": ["lspace", "width", "height", "depth", "voffset"], - "mphantom": [], - "mprescripts": [], - "mroot": [], - "mrow": ["xlink:href", "xlink:type", "xmlns:xlink"], - "mspace": ["depth", "height", "width"], - "msqrt": [], - "mstyle": ["displaystyle", "mathbackground", "mathcolor", "mathvariant", "scriptlevel"], - "msub": [], - "msubsup": [], - "msup": [], - "mtable": ["align", "columnalign", "columnlines", "columnspacing", "displaystyle", "equalcolumns", "equalrows", "frame", "rowalign", "rowlines", "rowspacing", "width"], - "mtd": ["columnalign", "columnspan", "rowalign", "rowspan"], - "mtext": [], - "mtr": ["columnalign", "rowalign"], - "munder": [], - "munderover": [], - "none": [], - "semantics": [] + // MathML Elements + "annotation": ["encoding"], + "annotation-xml": ["encoding"], + "maction": ["actiontype", "other", "selection"], + "math": ["class", "id", "display", "xmlns"], + "menclose": ["notation"], + "merror": [], + "mfrac": ["linethickness"], + "mi": ["mathvariant"], + "mmultiscripts": [], + "mn": [], + "mo": ["fence", "lspace", "maxsize", "minsize", "rspace", "stretchy"], + "mover": [], + "mpadded": ["lspace", "width", "height", "depth", "voffset"], + "mphantom": [], + "mprescripts": [], + "mroot": [], + "mrow": ["xlink:href", "xlink:type", "xmlns:xlink"], + "mspace": ["depth", "height", "width"], + "msqrt": [], + "mstyle": ["displaystyle", "mathbackground", "mathcolor", "mathvariant", "scriptlevel"], + "msub": [], + "msubsup": [], + "msup": [], + "mtable": ["align", "columnalign", "columnlines", "columnspacing", "displaystyle", "equalcolumns", "equalrows", "frame", "rowalign", "rowlines", "rowspacing", "width"], + "mtd": ["columnalign", "columnspan", "rowalign", "rowspan"], + "mtext": [], + "mtr": ["columnalign", "rowalign"], + "munder": [], + "munderover": [], + "none": [], + "semantics": [] }; // Produce a Namespace-aware version of svgWhitelist var svgWhiteListNS_ = {}; $.each(svgWhiteList_, function(elt, atts){ - var attNS = {}; - $.each(atts, function(i, att){ - if (att.indexOf(':') >= 0) { - var v = att.split(':'); - attNS[v[1]] = NS[(v[0]).toUpperCase()]; - } else { - attNS[att] = att == 'xmlns' ? NS.XMLNS : null; - } - }); - svgWhiteListNS_[elt] = attNS; + var attNS = {}; + $.each(atts, function(i, att){ + if (att.indexOf(':') >= 0) { + var v = att.split(':'); + attNS[v[1]] = NS[(v[0]).toUpperCase()]; + } else { + attNS[att] = att == 'xmlns' ? NS.XMLNS : null; + } + }); + svgWhiteListNS_[elt] = attNS; }); // Function: svgedit.sanitize.sanitizeSvg @@ -113,144 +113,144 @@ $.each(svgWhiteList_, function(elt, atts){ // Parameters: // node - The DOM element to be checked (we'll also check its children) svgedit.sanitize.sanitizeSvg = function(node) { - // Cleanup text nodes - if (node.nodeType == 3) { // 3 == TEXT_NODE - // Trim whitespace - node.nodeValue = node.nodeValue.replace(/^\s+|\s+$/g, ''); - // Remove if empty - if (node.nodeValue.length === 0) { - node.parentNode.removeChild(node); - } - } + // Cleanup text nodes + if (node.nodeType == 3) { // 3 == TEXT_NODE + // Trim whitespace + node.nodeValue = node.nodeValue.replace(/^\s+|\s+$/g, ''); + // Remove if empty + if (node.nodeValue.length === 0) { + node.parentNode.removeChild(node); + } + } - // We only care about element nodes. - // Automatically return for all non-element nodes, such as comments, etc. - if (node.nodeType != 1) { // 1 == ELEMENT_NODE - return; - } + // We only care about element nodes. + // Automatically return for all non-element nodes, such as comments, etc. + if (node.nodeType != 1) { // 1 == ELEMENT_NODE + return; + } - var doc = node.ownerDocument; - var parent = node.parentNode; - // can parent ever be null here? I think the root node's parent is the document... - if (!doc || !parent) { - return; - } + var doc = node.ownerDocument; + var parent = node.parentNode; + // can parent ever be null here? I think the root node's parent is the document... + if (!doc || !parent) { + return; + } - var allowedAttrs = svgWhiteList_[node.nodeName]; - var allowedAttrsNS = svgWhiteListNS_[node.nodeName]; + var allowedAttrs = svgWhiteList_[node.nodeName]; + var allowedAttrsNS = svgWhiteListNS_[node.nodeName]; - // if this element is supported, sanitize it - if (typeof allowedAttrs !== 'undefined') { + // if this element is supported, sanitize it + if (typeof allowedAttrs !== 'undefined') { - var seAttrs = []; - var i = node.attributes.length; - while (i--) { - // if the attribute is not in our whitelist, then remove it - // could use jQuery's inArray(), but I don't know if that's any better - var attr = node.attributes.item(i); - var attrName = attr.nodeName; - var attrLocalName = attr.localName; - var attrNsURI = attr.namespaceURI; - // Check that an attribute with the correct localName in the correct namespace is on - // our whitelist or is a namespace declaration for one of our allowed namespaces - if (!(allowedAttrsNS.hasOwnProperty(attrLocalName) && attrNsURI == allowedAttrsNS[attrLocalName] && attrNsURI != NS.XMLNS) && - !(attrNsURI == NS.XMLNS && REVERSE_NS[attr.nodeValue]) ) - { - // TODO(codedread): Programmatically add the se: attributes to the NS-aware whitelist. - // Bypassing the whitelist to allow se: prefixes. - // Is there a more appropriate way to do this? - if (attrName.indexOf('se:') === 0) { - seAttrs.push([attrName, attr.nodeValue]); - } - node.removeAttributeNS(attrNsURI, attrLocalName); - } + var seAttrs = []; + var i = node.attributes.length; + while (i--) { + // if the attribute is not in our whitelist, then remove it + // could use jQuery's inArray(), but I don't know if that's any better + var attr = node.attributes.item(i); + var attrName = attr.nodeName; + var attrLocalName = attr.localName; + var attrNsURI = attr.namespaceURI; + // Check that an attribute with the correct localName in the correct namespace is on + // our whitelist or is a namespace declaration for one of our allowed namespaces + if (!(allowedAttrsNS.hasOwnProperty(attrLocalName) && attrNsURI == allowedAttrsNS[attrLocalName] && attrNsURI != NS.XMLNS) && + !(attrNsURI == NS.XMLNS && REVERSE_NS[attr.nodeValue]) ) + { + // TODO(codedread): Programmatically add the se: attributes to the NS-aware whitelist. + // Bypassing the whitelist to allow se: prefixes. + // Is there a more appropriate way to do this? + if (attrName.indexOf('se:') === 0) { + seAttrs.push([attrName, attr.nodeValue]); + } + node.removeAttributeNS(attrNsURI, attrLocalName); + } - // Add spaces before negative signs where necessary - if (svgedit.browser.isGecko()) { - switch (attrName) { - case 'transform': - case 'gradientTransform': - case 'patternTransform': - var val = attr.nodeValue.replace(/(\d)-/g, '$1 -'); - node.setAttribute(attrName, val); - } - } + // Add spaces before negative signs where necessary + if (svgedit.browser.isGecko()) { + switch (attrName) { + case 'transform': + case 'gradientTransform': + case 'patternTransform': + var val = attr.nodeValue.replace(/(\d)-/g, '$1 -'); + node.setAttribute(attrName, val); + } + } - // For the style attribute, rewrite it in terms of XML presentational attributes - if (attrName == 'style') { - var props = attr.nodeValue.split(';'), - p = props.length; - while (p--) { - var nv = props[p].split(':'); - var styleAttrName = $.trim(nv[0]); - var styleAttrVal = $.trim(nv[1]); - // Now check that this attribute is supported - if (allowedAttrs.indexOf(styleAttrName) >= 0) { - node.setAttribute(styleAttrName, styleAttrVal); - } - } - node.removeAttribute('style'); - } - } + // For the style attribute, rewrite it in terms of XML presentational attributes + if (attrName == 'style') { + var props = attr.nodeValue.split(';'), + p = props.length; + while (p--) { + var nv = props[p].split(':'); + var styleAttrName = $.trim(nv[0]); + var styleAttrVal = $.trim(nv[1]); + // Now check that this attribute is supported + if (allowedAttrs.indexOf(styleAttrName) >= 0) { + node.setAttribute(styleAttrName, styleAttrVal); + } + } + node.removeAttribute('style'); + } + } - $.each(seAttrs, function(i, attr) { - node.setAttributeNS(NS.SE, attr[0], attr[1]); - }); + $.each(seAttrs, function(i, attr) { + node.setAttributeNS(NS.SE, attr[0], attr[1]); + }); - // for some elements that have a xlink:href, ensure the URI refers to a local element - // (but not for links) - var href = svgedit.utilities.getHref(node); - if (href && - ['filter', 'linearGradient', 'pattern', - 'radialGradient', 'textPath', 'use'].indexOf(node.nodeName) >= 0) - { - // TODO: we simply check if the first character is a #, is this bullet-proof? - if (href[0] != '#') { - // remove the attribute (but keep the element) - svgedit.utilities.setHref(node, ''); - node.removeAttributeNS(NS.XLINK, 'href'); - } - } + // for some elements that have a xlink:href, ensure the URI refers to a local element + // (but not for links) + var href = svgedit.utilities.getHref(node); + if (href && + ['filter', 'linearGradient', 'pattern', + 'radialGradient', 'textPath', 'use'].indexOf(node.nodeName) >= 0) + { + // TODO: we simply check if the first character is a #, is this bullet-proof? + if (href[0] != '#') { + // remove the attribute (but keep the element) + svgedit.utilities.setHref(node, ''); + node.removeAttributeNS(NS.XLINK, 'href'); + } + } - // Safari crashes on a without a xlink:href, so we just remove the node here - if (node.nodeName == 'use' && !svgedit.utilities.getHref(node)) { - parent.removeChild(node); - return; - } - // if the element has attributes pointing to a non-local reference, - // need to remove the attribute - $.each(['clip-path', 'fill', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'stroke'], function(i, attr) { - var val = node.getAttribute(attr); - if (val) { - val = svgedit.utilities.getUrlFromAttr(val); - // simply check for first character being a '#' - if (val && val[0] !== '#') { - node.setAttribute(attr, ''); - node.removeAttribute(attr); - } - } - }); + // Safari crashes on a without a xlink:href, so we just remove the node here + if (node.nodeName == 'use' && !svgedit.utilities.getHref(node)) { + parent.removeChild(node); + return; + } + // if the element has attributes pointing to a non-local reference, + // need to remove the attribute + $.each(['clip-path', 'fill', 'filter', 'marker-end', 'marker-mid', 'marker-start', 'mask', 'stroke'], function(i, attr) { + var val = node.getAttribute(attr); + if (val) { + val = svgedit.utilities.getUrlFromAttr(val); + // simply check for first character being a '#' + if (val && val[0] !== '#') { + node.setAttribute(attr, ''); + node.removeAttribute(attr); + } + } + }); - // recurse to children - i = node.childNodes.length; - while (i--) { svgedit.sanitize.sanitizeSvg(node.childNodes.item(i)); } - } - // else (element not supported), remove it - else { - // remove all children from this node and insert them before this node - // FIXME: in the case of animation elements this will hardly ever be correct - var children = []; - while (node.hasChildNodes()) { - children.push(parent.insertBefore(node.firstChild, node)); - } + // recurse to children + i = node.childNodes.length; + while (i--) { svgedit.sanitize.sanitizeSvg(node.childNodes.item(i)); } + } + // else (element not supported), remove it + else { + // remove all children from this node and insert them before this node + // FIXME: in the case of animation elements this will hardly ever be correct + var children = []; + while (node.hasChildNodes()) { + children.push(parent.insertBefore(node.firstChild, node)); + } - // remove this node from the document altogether - parent.removeChild(node); + // remove this node from the document altogether + parent.removeChild(node); - // call sanitizeSvg on each of those children - var i = children.length; - while (i--) { svgedit.sanitize.sanitizeSvg(children[i]); } - } + // call sanitizeSvg on each of those children + var i = children.length; + while (i--) { svgedit.sanitize.sanitizeSvg(children[i]); } + } }; })();