Skip to content
Merged
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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,19 @@ __In Browser__
## Options

### singleTags
Array tags for extend default list single tags
Array tags for extend default list single tags. Values can be strings or regular expressions.

__Default__: `[]`

*Options* `{ singleTags: ['rect', 'custom'] }`
*Options* `{ singleTags: ['rect', 'custom', /^%.*%$/] }`

```html
...
<div>
...
<rect>
<custom>
<%=title%>
</div>
```

Expand Down
21 changes: 19 additions & 2 deletions lib/posthtml-render.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,19 @@ function postHTMLRender(tree, options) {
var SINGLE_TAGS = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen',
'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'];
var singleTags = {};
var regexpSingleTags = [];

for (var i = 0, leni = SINGLE_TAGS.length; i < leni; i++) {
singleTags[SINGLE_TAGS[i]] = 1;
}

if (optSingleTags) {
for (var j = 0, lenj = optSingleTags.length; j < lenj; j++) {
singleTags[optSingleTags[j]] = 1;
if (optSingleTags[j] instanceof RegExp) {
regexpSingleTags.push(optSingleTags[j]);
} else {
singleTags[optSingleTags[j]] = 1;
}
}
}

Expand Down Expand Up @@ -60,7 +65,7 @@ function postHTMLRender(tree, options) {
}

var tag = node.tag || 'div';
if (singleTags[tag]) {
if (isSingleTag(tag, singleTags, regexpSingleTags)) {
buf += '<'+ tag + attrs(node.attrs);
switch (closingSingleTag) {
case 'slash':
Expand Down Expand Up @@ -107,6 +112,18 @@ function traverse(tree, cb) {
return tree;
}

function isSingleTag(tag, strings, regexps) {
if (strings[tag]) {
return true;
}
for (var i = 0; i < regexps.length; i++) {
if (tag.match(regexps[i])) {
return true;
}
}
return false;
}

var defineAsGlobal = true;

/* istanbul ignore next */
Expand Down
2 changes: 1 addition & 1 deletion posthtml-render.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ describe('PostHTML-Render test', function() {
expect(render({ tag: 'rect' }, { singleTags: ['rect'] })).to.eql('<rect>');
});

it('use regexp', function() {
expect(render({ tag: '%=title%' }, { singleTags: [/^%.*%$/] })).to.eql('<%=title%>');
});

it('safe attrs', function() {
expect(render({ tag: 'rect', attrs: { id: 'id' } }, { singleTags: ['rect'] })).to.eql('<rect id="id">');
});
Expand Down