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
33 changes: 21 additions & 12 deletions src/browser/dom/mutation_observer.zig
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ pub const MutationObserver = struct {
.connected = true,
.scheduled = false,
.arena = page.arena,
.loop_node = .{.func = callback},
.loop_node = .{ .func = callback },
};
}

Expand Down Expand Up @@ -227,7 +227,12 @@ const Observer = struct {

event_node: parser.EventNode,

fn appliesTo(self: *const Observer, target: *parser.Node, event_type: MutationEventType, event: *parser.MutationEvent,) !bool {
fn appliesTo(
self: *const Observer,
target: *parser.Node,
event_type: MutationEventType,
event: *parser.MutationEvent,
) !bool {
if (event_type == .DOMAttrModified and self.options.attributeFilter.len > 0) {
const attribute_name = try parser.mutationEventAttributeName(event);
for (self.options.attributeFilter) |needle| blk: {
Expand Down Expand Up @@ -366,9 +371,10 @@ test "Browser.DOM.MutationObserver" {
\\ document.firstElementChild.setAttribute("foo", "bar");
\\ // ignored b/c it's about another target.
\\ document.firstElementChild.firstChild.setAttribute("foo", "bar");
,null
,
null,
},
.{ "nb", "1"},
.{ "nb", "1" },
.{ "mrs[0].type", "attributes" },
.{ "mrs[0].target == document.firstElementChild", "true" },
.{ "mrs[0].target.getAttribute('foo')", "bar" },
Expand All @@ -386,9 +392,10 @@ test "Browser.DOM.MutationObserver" {
\\ nb2++;
\\ }).observe(node, { characterData: true, characterDataOldValue: true });
\\ node.data = "foo";
, null
,
null,
},
.{ "nb2", "1"},
.{ "nb2", "1" },
.{ "mrs2[0].type", "characterData" },
.{ "mrs2[0].target == node", "true" },
.{ "mrs2[0].target.data", "foo" },
Expand All @@ -405,9 +412,10 @@ test "Browser.DOM.MutationObserver" {
\\ node.innerText = 'a';
\\ }).observe(document, { subtree:true,childList:true });
\\ node.innerText = "2";
, null
,
null,
},
.{"node.innerText", "a"},
.{ "node.innerText", "a" },
}, .{});

try runner.testCases(&.{
Expand All @@ -418,10 +426,11 @@ test "Browser.DOM.MutationObserver" {
\\ attrWatch++;
\\ }).observe(document, { attributeFilter: ["name"], subtree: true });
\\ node.setAttribute("id", "1");
, null
,
null,
},
.{"attrWatch", "0"},
.{ "node.setAttribute('name', 'other');", null},
.{ "attrWatch", "1"},
.{ "attrWatch", "0" },
.{ "node.setAttribute('name', 'other');", null },
.{ "attrWatch", "1" },
}, .{});
}
8 changes: 4 additions & 4 deletions src/browser/events/event.zig
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ pub const EventHandler = struct {
.typ = try allocator.dupe(u8, typ),
.signal_target = signal_target,
.signal_listener = undefined,
.node = .{.func = SignalCallback.handle },
.node = .{ .func = SignalCallback.handle },
};

scb.signal_listener = try parser.eventTargetAddEventListener(
Expand Down Expand Up @@ -285,7 +285,7 @@ const SignalCallback = struct {
typ: []const u8,
capture: bool,
callback_id: usize,
node : parser.EventNode,
node: parser.EventNode,
target: *parser.EventTarget,
signal_target: *parser.EventTarget,
signal_listener: *parser.EventListener,
Expand Down Expand Up @@ -435,11 +435,11 @@ test "Browser.Event" {

try runner.testCases(&.{
.{ "nb = 0; function cbk(event) { nb ++; }", null },
.{ "let ac = new AbortController()", null},
.{ "let ac = new AbortController()", null },
.{ "document.addEventListener('count', cbk, {signal: ac.signal})", null },
.{ "document.dispatchEvent(new Event('count'))", "true" },
.{ "document.dispatchEvent(new Event('count'))", "true" },
.{ "ac.abort()", null},
.{ "ac.abort()", null },
.{ "document.dispatchEvent(new Event('count'))", "true" },
.{ "nb", "2" },
.{ "document.removeEventListener('count', cbk)", "undefined" },
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/js.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3420,7 +3420,7 @@ fn valueToDetailString(arena: Allocator, value: v8.Value, isolate: v8.Isolate, v
if (debugValueToString(arena, value.castTo(v8.Object), isolate, v8_context)) |ds| {
return ds;
} else |err| {
log.err(.js, "debug serialize value", .{.err = err});
log.err(.js, "debug serialize value", .{ .err = err });
}
}
}
Expand Down