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

Jump to bottom

handle whitespace within and around inline tags #519

Merged
merged 5 commits into from
Mar 1, 2016
Merged

handle whitespace within and around inline tags #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0dc2cb
handle whitespace within and around inline tags
alexlamsl Mar 1, 2016
ac3aded
use single array to store minification fragments
alexlamsl Mar 1, 2016
fdbc328
improve handling of trailing inline whitespace
alexlamsl Mar 1, 2016
7ff2229
more permissive trailing whitespace detection
alexlamsl Mar 1, 2016
3c17af6
use String.slice() instead of substr()
alexlamsl Mar 1, 2016
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
58 changes: 43 additions & 15 deletions dist/htmlminifier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,15 +619,22 @@
return lineBreakBefore + str + lineBreakAfter;
}

// array of non-empty element tags that will maintain a single space outside of them
// non-empty tags that will maintain whitespace around them
var inlineTags = createMapFromString('a,abbr,acronym,b,bdi,bdo,big,button,cite,code,del,dfn,em,font,i,ins,kbd,mark,math,q,rt,rp,s,samp,small,span,strike,strong,sub,sup,svg,time,tt,u,var');
// non-empty tags that will maintain whitespace within them
var inlineTextTags = createMapFromString('a,abbr,acronym,b,big,del,em,font,i,ins,kbd,mark,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var');
// self-closing tags that will maintain whitespace around them
var selfClosingInlineTags = createMapFromString('comment,img,input');

function collapseWhitespaceSmart(str, prevTag, nextTag, options) {
var trimLeft = prevTag && !selfClosingInlineTags(prevTag) &&
(options.collapseInlineTagWhitespace || prevTag.charAt(0) !== '/' || !inlineTags(prevTag.substr(1)));
var trimRight = nextTag && !selfClosingInlineTags(nextTag) &&
(options.collapseInlineTagWhitespace || nextTag.charAt(0) === '/' || !inlineTags(nextTag));
var trimLeft = prevTag && !selfClosingInlineTags(prevTag);
if (trimLeft && !options.collapseInlineTagWhitespace) {
trimLeft = prevTag.charAt(0) === '/' ? !inlineTags(prevTag.slice(1)) : !inlineTextTags(prevTag);
}
var trimRight = nextTag && !selfClosingInlineTags(nextTag);
if (trimRight && !options.collapseInlineTagWhitespace) {
trimRight = nextTag.charAt(0) === '/' ? !inlineTextTags(nextTag.slice(1)) : !inlineTags(nextTag);
}
return collapseWhitespace(str, options, trimLeft, trimRight, prevTag && nextTag);
}

Expand Down Expand Up @@ -1254,10 +1261,10 @@
setDefaultTesters(options);
value = options.collapseWhitespace ? trimWhitespace(value) : value;

var results = [ ],
buffer = [ ],
var buffer = [ ],
charsPrevTag,
currentChars = '',
hasChars,
currentTag = '',
currentAttrs = [],
stackNoTrimWhitespace = [],
Expand Down Expand Up @@ -1348,7 +1355,10 @@

currentTag = tag;
charsPrevTag = tag;
currentChars = '';
if (!inlineTextTags(tag)) {
currentChars = '';
}
hasChars = false;
currentAttrs = attrs;

var optional = options.removeOptionalTags;
Expand Down Expand Up @@ -1452,7 +1462,7 @@
var isElementEmpty = false;
if (tag === currentTag) {
currentTag = '';
isElementEmpty = currentChars === '';
isElementEmpty = !hasChars;
}

if (options.removeOptionalTags) {
Expand All @@ -1479,10 +1489,11 @@
}
else {
// push out everything but the end tag
results.push.apply(results, buffer);
buffer = ['</' + tag + '>'];
buffer.push('</' + tag + '>');
charsPrevTag = '/' + tag;
currentChars = '';
if (!inlineTextTags(tag)) {
currentChars = '';
}
}
},
chars: function(text, prevTag, nextTag) {
Expand All @@ -1495,15 +1506,30 @@
if (removed) {
prevTag = charsPrevTag;
}
if (buffer.length > 1 && (removed || currentChars.charAt(currentChars.length - 1) === ' ')) {
if (buffer.length > 1 && (removed || / $/.test(currentChars))) {
var charsIndex = buffer.length - 2;
buffer[charsIndex] = buffer[charsIndex].replace(/\s+$/, function(trailingSpaces) {
text = trailingSpaces + text;
return '';
});
}
}
if (prevTag && inlineTextTags(prevTag.charAt(0) === '/' ? prevTag.slice(1) : prevTag)) {
text = collapseWhitespace(text, options, /(?:^|\s)$/.test(currentChars));
}
text = prevTag || nextTag ? collapseWhitespaceSmart(text, prevTag, nextTag, options) : trimWhitespace(text);
if (!text && /\s$/.test(currentChars) && prevTag && prevTag.charAt(0) === '/') {
for (var index = buffer.length - 2, endTag = prevTag.slice(1); index >= 0 && _canTrimWhitespace(endTag); index--) {
var str = buffer[index];
var match = str.match(/^<\/([\w:-]+)>$/);
if (match) {
endTag = match[1];
}
else if (/>$/.test(str) || (buffer[index] = collapseWhitespaceSmart(str, null, nextTag, options))) {
break;
}
}
}
}
if (!stackNoCollapseWhitespace.length) {
text = prevTag && nextTag || nextTag === 'html' ? text : collapseWhitespaceAll(text);
Expand Down Expand Up @@ -1545,6 +1571,9 @@
}
charsPrevTag = /^\s*$/.test(text) ? prevTag : 'comment';
currentChars += text;
if (text) {
hasChars = true;
}
if (lint) {
lint.testChars(text);
}
Expand Down Expand Up @@ -1593,8 +1622,7 @@
}
}

results.push.apply(results, buffer);
var str = joinResultSegments(results, options);
var str = joinResultSegments(buffer, options);

if (uidAttr) {
str = str.replace(new RegExp('(\\s*)' + uidAttr + '([0-9]+)(\\s*)', 'g'), function(match, prefix, index, suffix) {
Expand Down
Loading