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
4 changes: 2 additions & 2 deletions src/browser/ScriptManager.zig
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ pub fn addFromElement(self: *ScriptManager, element: *parser.Element) !void {
.element = element,
.source = source,
.url = remote_url orelse page.url.raw,
.is_defer = try parser.elementGetAttribute(element, "defer") != null,
.is_async = try parser.elementGetAttribute(element, "async") != null,
.is_defer = if (remote_url == null) false else try parser.elementGetAttribute(element, "defer") != null,
.is_async = if (remote_url == null) false else try parser.elementGetAttribute(element, "async") != null,
};

if (source == .@"inline" and self.scripts.first == null) {
Expand Down
4 changes: 4 additions & 0 deletions src/browser/html/elements.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ test "Browser.HTML.HTMLStyleElement" {
}, .{});
}

test "Browser: HTML.HTMLScriptElement" {
try testing.htmlRunner("html/script/inline_defer.html");
}

const Check = struct {
input: []const u8,
expected: ?[]const u8 = null, // Needed when input != expected
Expand Down
27 changes: 27 additions & 0 deletions src/tests/html/script/inline_defer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<head>
<script>
let dyn1_loaded = 0;
function loadScript(src) {
const script = document.createElement('script');
script.src = src;
document.getElementsByTagName("head")[0].appendChild(script)
}
</script>
</head>

<script src="../../testing.js"></script>

<script defer>
loadScript('inline_defer.js');
</script>

<script async>
loadScript('inline_defer.js');
</script>

<script id=inline_defer>
// inline script should ignore defer and async attributes. If we don't do
// this correctly, we'd end up in an infinite loop
// https://github.com/lightpanda-io/browser/issues/1014
testing.eventually(() => testing.expectEqual(2, dyn1_loaded));
</script>
1 change: 1 addition & 0 deletions src/tests/html/script/inline_defer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dyn1_loaded += 1;