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

.html() send context to parse5 #1627

Merged
merged 2 commits into from
Jan 1, 2021
Merged

.html() send context to parse5 #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4983ebe
.html() send context to parse5
5saviahv Jan 1, 2021
b4b6431
.html() test with script element
5saviahv Jan 1, 2021
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
4 changes: 3 additions & 1 deletion lib/api/manipulation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,13 +753,15 @@ exports.html = function (str) {
return html(this[0].children, this.options);
}

var opts = this.options;
var opts = Object.apply({}, this.options); // keep main options

return domEach(this, function (_, el) {
el.children.forEach(function (child) {
child.next = child.prev = child.parent = null;
});

opts.context = el;

var content = str.cheerio
? str.clone().get()
: parse('' + str, opts, false).children;
Expand Down
12 changes: 8 additions & 4 deletions lib/parsers/parse5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ var parse5 = require('parse5');
var htmlparser2Adapter = require('parse5-htmlparser2-tree-adapter');

exports.parse = function (content, options, isDocument) {
var parse = isDocument ? parse5.parse : parse5.parseFragment;

return parse(content, {
var opts = {
treeAdapter: htmlparser2Adapter,
sourceCodeLocationInfo: options.sourceCodeLocationInfo,
});
};

var context = options.context;

return isDocument
? parse5.parse(content, opts)
: parse5.parseFragment(context, content, opts);
};

exports.render = function (dom) {
Expand Down
13 changes: 13 additions & 0 deletions test/api/manipulation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1611,6 +1611,19 @@ describe('$(...)', function () {
$remove.replaceWith($children);
expect($fruits.children()).toHaveLength(4);
});

it('(script value) : should add content as text', function () {
var $data = '<a><b>';
var $script = $('<script>').html($data);

expect($script).toHaveLength(1);
expect($script[0].type).toBe('script');
expect($script[0].name).toBe('script');

expect($script[0].children).toHaveLength(1);
expect($script[0].children[0].type).toBe('text');
expect($script[0].children[0].data).toBe($data);
});
});

describe('.toString', function () {
Expand Down