aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[spidermonkey] Fixes in querySelector

Browse Source
This commit is contained in:
Witold Filipczyk 2021-12-17 15:33:14 +01:00
parent 8ec96e4f90
commit b9482dfbbf
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3021,6 +3021,19 @@ element_matches(JSContext *ctx, unsigned int argc, JS::Value *vp)
return true;
}
static bool
isAncestor(xmlpp::Element *el, xmlpp::Element *node)
{
while (node) {
if (el == node) {
return true;
}
node = node->get_parent();
}
return false;
}
static bool
element_querySelector(JSContext *ctx, unsigned int argc, JS::Value *vp)
{
@ -3065,20 +3078,19 @@ element_querySelector(JSContext *ctx, unsigned int argc, JS::Value *vp)
return true;
}
if (elements.size() == 0) {
args.rval().setNull();
return true;
}
auto node = elements[0];
JSObject *elem = getElement(ctx, node);
if (elem) {
args.rval().setObject(*elem);
} else {
args.rval().setNull();
for (auto node: elements)
{
if (isAncestor(el, node))
{
JSObject *elem = getElement(ctx, node);
if (elem) {
args.rval().setObject(*elem);
return true;
}
}
}
args.rval().setNull();
return true;
}
@ -3125,6 +3137,7 @@ element_querySelectorAll(JSContext *ctx, unsigned int argc, JS::Value *vp)
} catch (xmlpp::exception) {
}
elements->erase(std::remove_if(elements->begin(), elements->end(), [el](xmlpp::Node *node){return !isAncestor(el, node);}));
JSObject *elem = getCollection(ctx, elements);
if (elem) {