aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-10-01 03:36:26 -04:00
Code

[spidermonkey] Fixes in querySelectorAll

Browse Source
This commit is contained in:
Witold Filipczyk 2022-01-04 20:08:37 +01:00
parent 8749089352
commit 550b636880
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ecmascript/spidermonkey/element.c
View File

@ -3155,15 +3155,25 @@ element_querySelectorAll(JSContext *ctx, unsigned int argc, JS::Value *vp)
xmlpp::ustring css = cssstr.source;
xmlpp::ustring xpath = css2xpath(css);
done_string(&cssstr);
xmlpp::Node::NodeSet *elements = new xmlpp::Node::NodeSet;
xmlpp::Node::NodeSet *res = new(std::nothrow) xmlpp::Node::NodeSet;
try {
*elements = el->find(xpath);
} catch (xmlpp::exception) {
if (!res) {
return false;
}
elements->erase(std::remove_if(elements->begin(), elements->end(), [el](xmlpp::Node *node){return !isAncestor(el, node);}));
JSObject *elem = getCollection(ctx, elements);
xmlpp::Node::NodeSet elements;
try {
elements = el->find(xpath);
} catch (xmlpp::exception) {}
for (auto node : elements)
{
if (isAncestor(el, node)) {
res->push_back(node);
}
}
JSObject *elem = getCollection(ctx, res);
if (elem) {
args.rval().setObject(*elem);