Skip to content

handle   better in collapseWhitespace #785

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

Merged
merged 1 commit into from
Feb 19, 2017
Merged

handle   better in collapseWhitespace #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions src/htmlminifier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,10 @@ var trimWhitespace = String.prototype.trim ? function(str) {
return str.replace(/^\s+/, '').replace(/\s+$/, '');
};

function compressWhitespace(spaces) {
return spaces === '\t' ? '\t' : spaces.replace(/(^|\xA0+)[^\xA0]+/g, '$1 ');
}

function collapseWhitespaceAll(str) {
return str && str.replace(/\s+/g, compressWhitespace);
}

function compressWhitespaceLeft(spaces) {
return spaces === '\t' ? '\t' : spaces.replace(/^[^\xA0]+/, '').replace(/(\xA0+)[^\xA0]+/g, '$1 ') || ' ';
}

function compressWhitespaceRight(spaces) {
return spaces === '\t' ? '\t' : spaces.replace(/[^\xA0]+(\xA0+)/g, ' $1').replace(/[^\xA0]+$/, '') || ' ';
return str && str.replace(/\s+/g, function(spaces) {
return spaces === '\t' ? '\t' : spaces.replace(/(^|\xA0+)[^\xA0]+/g, '$1 ');
});
}

function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) {
Expand All @@ -50,11 +40,23 @@ function collapseWhitespace(str, options, trimLeft, trimRight, collapseAll) {
}

if (trimLeft) {
str = str.replace(/^\s+/, !lineBreakBefore && options.conservativeCollapse ? compressWhitespaceLeft : '');
str = str.replace(/^\s+/, function(spaces) {
var conservative = !lineBreakBefore && options.conservativeCollapse;
if (conservative && spaces === '\t') {
return '\t';
}
return spaces.replace(/^[^\xA0]+/, '').replace(/(\xA0+)[^\xA0]+/g, '$1 ') || (conservative ? ' ' : '');
});
}

if (trimRight) {
str = str.replace(/\s+$/, !lineBreakAfter && options.conservativeCollapse ? compressWhitespaceRight : '');
str = str.replace(/\s+$/, function(spaces) {
var conservative = !lineBreakAfter && options.conservativeCollapse;
if (conservative && spaces === '\t') {
return '\t';
}
return spaces.replace(/[^\xA0]+(\xA0+)/g, ' $1').replace(/[^\xA0]+$/, '') || (conservative ? ' ' : '');
});
}

if (collapseAll) {
Expand Down
33 changes: 33 additions & 0 deletions tests/minifier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,41 +2320,71 @@ QUnit.test('conservative collapse', function(assert) {
}), output);

input = '<p>\u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), input);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), input);

input = '<p> \u00A0</p>';
output = '<p>\u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p>\u00A0 </p>';
output = '<p>\u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p> \u00A0 </p>';
output = '<p>\u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p> \u00A0\u00A0 \u00A0 </p>';
output = '<p>\u00A0\u00A0 \u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p>foo \u00A0\u00A0 \u00A0 </p>';
output = '<p>foo \u00A0\u00A0 \u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p> \u00A0\u00A0 \u00A0 bar</p>';
output = '<p>\u00A0\u00A0 \u00A0 bar</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p>foo \u00A0\u00A0 \u00A0 bar</p>';
output = '<p>foo \u00A0\u00A0 \u00A0 bar</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p> \u00A0foo\u00A0\t</p>';
output = '<p>\u00A0foo\u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
Expand All @@ -2363,6 +2393,7 @@ QUnit.test('conservative collapse', function(assert) {

input = '<p> \u00A0\nfoo\u00A0\t</p>';
output = '<p>\u00A0 foo\u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
Expand All @@ -2371,13 +2402,15 @@ QUnit.test('conservative collapse', function(assert) {

input = '<p> \u00A0foo \u00A0\t</p>';
output = '<p>\u00A0foo \u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
}), output);

input = '<p> \u00A0\nfoo \u00A0\t</p>';
output = '<p>\u00A0 foo \u00A0</p>';
assert.equal(minify(input, { collapseWhitespace: true }), output);
assert.equal(minify(input, {
collapseWhitespace: true,
conservativeCollapse: true
Expand Down