diff --git a/src/browser/html/location.zig b/src/browser/html/location.zig index abe097bc..ea7d45e1 100644 --- a/src/browser/html/location.zig +++ b/src/browser/html/location.zig @@ -38,7 +38,7 @@ pub const Location = struct { } pub fn set_href(_: *const Location, href: []const u8, page: *Page) !void { - return page.navigateFromWebAPI(href, .{ .reason = .script }); + return page.navigateFromWebAPI(href, .{ .reason = .script }, .{ .push = null }); } pub fn get_protocol(self: *Location) []const u8 { @@ -73,10 +73,6 @@ pub const Location = struct { return self.url.get_origin(page); } - pub fn set_href(_: *Location, url: []const u8, page: *Page) !void { - return page.navigateFromWebAPI(url, .{ .reason = .script }, .{ .push = null }); - } - pub fn _assign(_: *const Location, url: []const u8, page: *Page) !void { return page.navigateFromWebAPI(url, .{ .reason = .script }, .{ .push = null }); } diff --git a/src/browser/navigation/navigation.zig b/src/browser/navigation/navigation.zig index 9e08bf04..469e13fc 100644 --- a/src/browser/navigation/navigation.zig +++ b/src/browser/navigation/navigation.zig @@ -147,7 +147,7 @@ pub const NavigationCurrentEntryChangeEvent = struct { pub const EventInit = struct { from: *NavigationHistoryEntry, - navigation_type: ?NavigationType = null, + navigationType: ?NavigationType = null, }; proto: parser.Event, @@ -164,7 +164,7 @@ pub const NavigationCurrentEntryChangeEvent = struct { return .{ .proto = event.*, .from = opts.from, - .navigation_type = opts.navigation_type, + .navigation_type = opts.navigationType, }; } @@ -184,7 +184,7 @@ pub const NavigationCurrentEntryChangeEvent = struct { var evt = NavigationCurrentEntryChangeEvent.constructor( "currententrychange", - .{ .from = from, .navigation_type = typ }, + .{ .from = from, .navigationType = typ }, ) catch |err| { log.err(.app, "event constructor error", .{ .err = err, diff --git a/src/browser/page.zig b/src/browser/page.zig index ff6ecfbe..2e7bf9a2 100644 --- a/src/browser/page.zig +++ b/src/browser/page.zig @@ -34,7 +34,7 @@ const Http = @import("../http/Http.zig"); const ScriptManager = @import("ScriptManager.zig"); const SlotChangeMonitor = @import("SlotChangeMonitor.zig"); const HTMLDocument = @import("html/document.zig").HTMLDocument; -const NavigationKind = @import("html/Navigation.zig").NavigationKind; +const NavigationKind = @import("navigation/navigation.zig").NavigationKind; const js = @import("js/js.zig"); const URL = @import("../url.zig").URL;