sysutils/svgo
1
0
Fork 0
mirror of https://github.com/svg/svgo.git synced 2025-07-31 07:44:22 +03:00
Code Activity

Clean up cleanupID logic, use null prototype for maps

Browse Source 
Reduce string creation

Add test for __proto__
This commit is contained in:
Bo Lopker
2015-09-10 13:36:03 -07:00
committed by GreLI
parent eada149cb6
commit 176d0329a4
2 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/cleanupIDs.js
View File

@ -36,8 +36,8 @@ exports.fn = function(data, params) {
var currentID, var currentID,
currentIDstring, currentIDstring,
IDs = {}, IDs = Object.create(null),
referencesIDs = {}, referencesIDs = Object.create(null),
idPrefix = 'id-', // prefix IDs so that values like '__proto__' don't break the work idPrefix = 'id-', // prefix IDs so that values like '__proto__' don't break the work
hasStyleOrScript = false; hasStyleOrScript = false;
@ -57,20 +57,21 @@ exports.fn = function(data, params) {
// check if <style> of <script> presents // check if <style> of <script> presents
if (item.isElem(styleOrScript)) { if (item.isElem(styleOrScript)) {
hasStyleOrScript = true; hasStyleOrScript = true;
continue;
} }
// …and don't remove any ID if yes // …and don't remove any ID if yes
if (!hasStyleOrScript) {
if (item.isElem()) { if (item.isElem()) {
item.eachAttr(function(attr) { item.eachAttr(function(attr) {
var key;
// save IDs // save IDs
if (attr.name === 'id') { if (attr.name === 'id') {
if (idPrefix + attr.value in IDs) { key = idPrefix + attr.value;
if (key in IDs) {
item.removeAttr('id'); item.removeAttr('id');
} else { } else {
IDs[idPrefix + attr.value] = item; IDs[key] = item;
} }
} }
@ -79,10 +80,11 @@ exports.fn = function(data, params) {
match = attr.value.match(regReferencesUrl); match = attr.value.match(regReferencesUrl);
if (match) { if (match) {
if (referencesIDs[idPrefix + match[2]]) { key = idPrefix + match[2];
referencesIDs[idPrefix + match[2]].push(attr); if (referencesIDs[key]) {
referencesIDs[key].push(attr);
} else { } else {
referencesIDs[idPrefix + match[2]] = [attr]; referencesIDs[key] = [attr];
} }
} }
} }
@ -92,10 +94,11 @@ exports.fn = function(data, params) {
attr.name === 'xlink:href' && (match = attr.value.match(regReferencesHref)) || attr.name === 'xlink:href' && (match = attr.value.match(regReferencesHref)) ||
attr.name === 'begin' && (match = attr.value.match(regReferencesBegin)) attr.name === 'begin' && (match = attr.value.match(regReferencesBegin))
) { ) {
if (referencesIDs[idPrefix + match[1]]) { key = idPrefix + match[1];
referencesIDs[idPrefix + match[1]].push(attr); if (referencesIDs[key]) {
referencesIDs[key].push(attr);
} else { } else {
referencesIDs[idPrefix + match[1]] = [attr]; referencesIDs[key] = [attr];
} }
} }
}); });
@ -106,9 +109,6 @@ exports.fn = function(data, params) {
if (item.content) { if (item.content) {
monkeys(item); monkeys(item);
} }
}
} }
return items; return items;
@ -117,8 +117,9 @@ exports.fn = function(data, params) {
data = monkeys(data); data = monkeys(data);
if (!hasStyleOrScript) { if (hasStyleOrScript) {
return data;
}
for (var k in referencesIDs) { for (var k in referencesIDs) {
if (IDs[k]) { if (IDs[k]) {
@ -153,8 +154,6 @@ exports.fn = function(data, params) {
} }
}
return data; return data;
}; };

8
test/plugins/cleanupIDs.04.svg
View File

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs> <defs>
<text id="test01"> <text id="__proto__">
referenced text referenced text
</text> </text>
<text id="test02"> <text id="test02">
@ -160,9 +160,9 @@
referenced text referenced text
</text> </text>
</defs> </defs>
<tref xlink:href="#test01"/> <tref xlink:href="#__proto__"/>
<tref xlink:href="#test01"/> <tref xlink:href="#__proto__"/>
<tref xlink:href="#test01"/> <tref xlink:href="#__proto__"/>
<tref xlink:href="#test02"/> <tref xlink:href="#test02"/>
<tref xlink:href="#test03"/> <tref xlink:href="#test03"/>
<tref xlink:href="#test04"/> <tref xlink:href="#test04"/>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB