Skip to content

add ignoreCollapse options #23

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/parse-tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = function (tag) {
}
res.name = match;
} else {
res.attrs[key] = match.replace(/^['"]|['"]$/g, '');
res.attrs[key] = match; // .replace(/^['"]|['"]$/g, '');
key=undefined;
}
}
Expand Down
10 changes: 5 additions & 5 deletions lib/parse.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ var parseTag = require('./parse-tag');
// re-used obj for quick lookups of components
var empty = Object.create ? Object.create(null) : {};
// common logic for pushing a child node onto a list
function pushTextNode(list, html, level, start, ignoreWhitespace) {
function pushTextNode(list, html, level, start, ignoreWhitespace, ignoreCollapse) {
// calculate correct end of the content slice in case there's
// no tag after the text node.
var end = html.indexOf('<', start);
var content = html.slice(start, end === -1 ? undefined : end);
// if a node is nothing but whitespace, collapse it as the spec states:
// https://www.w3.org/TR/html4/struct/text.html#h-9.1
if (/^\s*$/.test(content)) {
if (!ignoreCollapse && /^\s*$/.test(content)) {
content = ' ';
}
// don't add whitespace-only text nodes if they would be trailing text nodes
Expand Down Expand Up @@ -61,7 +61,7 @@ module.exports = function parse(html, options) {
}

if (!current.voidElement && !inComponent && nextChar && nextChar !== '<') {
pushTextNode(current.children, html, level, start, options.ignoreWhitespace);
pushTextNode(current.children, html, level, start, options.ignoreWhitespace, options.ignoreCollapse);
}

byTag[current.tagName] = current;
Expand Down Expand Up @@ -89,14 +89,14 @@ module.exports = function parse(html, options) {
// if we're at the root, push a base text node. otherwise add as
// a child to the current node.
parent = level === -1 ? result : arr[level].children;
pushTextNode(parent, html, level, start, options.ignoreWhitespace);
pushTextNode(parent, html, level, start, options.ignoreWhitespace, options.ignoreCollapse);
}
}
});

// If the "html" passed isn't actually html, add it as a text node.
if (!result.length && html.length) {
pushTextNode(result, html, 0, 0, options.ignoreWhitespace);
pushTextNode(result, html, 0, 0, options.ignoreWhitespace, options.ignoreCollapse);
}

return result;
Expand Down
2 changes: 1 addition & 1 deletion lib/stringify.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function attrString(attrs) {
var buff = [];
for (var key in attrs) {
buff.push(key + '="' + attrs[key] + '"');
buff.push(key + '=' + attrs[key]);
}
if (!buff.length) {
return '';
Expand Down