mirror of
https://github.com/lightpanda-io/browser.git
synced 2025-12-14 23:38:57 +00:00
handle empty hashes in Location
This commit is contained in:
@@ -17,8 +17,6 @@
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
const std = @import("std");
|
||||
const Uri = std.Uri;
|
||||
|
||||
const Page = @import("../page.zig").Page;
|
||||
const URL = @import("../url/url.zig").URL;
|
||||
|
||||
@@ -44,10 +42,19 @@ pub const Location = struct {
|
||||
}
|
||||
|
||||
pub fn set_hash(_: *const Location, hash: []const u8, page: *Page) !void {
|
||||
const normalized_hash = if (hash[0] == '#')
|
||||
hash
|
||||
else
|
||||
try std.fmt.allocPrint(page.arena, "#{s}", .{hash});
|
||||
const normalized_hash = blk: {
|
||||
if (hash.len == 0) {
|
||||
const old_url = page.url.raw;
|
||||
|
||||
break :blk if (std.mem.indexOfScalar(u8, old_url, '#')) |index|
|
||||
old_url[0..index]
|
||||
else
|
||||
old_url;
|
||||
} else if (hash[0] == '#')
|
||||
break :blk hash
|
||||
else
|
||||
break :blk try std.fmt.allocPrint(page.arena, "#{s}", .{hash});
|
||||
};
|
||||
|
||||
return page.navigateFromWebAPI(normalized_hash, .{ .reason = .script }, .replace);
|
||||
}
|
||||
|
||||
@@ -15,6 +15,10 @@
|
||||
</script>
|
||||
|
||||
<script id=location_hash>
|
||||
location.hash = "";
|
||||
testing.expectEqual("", location.hash);
|
||||
testing.expectEqual('http://localhost:9582/src/tests/html/location.html', location.href);
|
||||
|
||||
location.hash = "#abcdef";
|
||||
testing.expectEqual("#abcdef", location.hash);
|
||||
testing.expectEqual('http://localhost:9582/src/tests/html/location.html#abcdef', location.href);
|
||||
@@ -22,4 +26,8 @@
|
||||
location.hash = "xyzxyz";
|
||||
testing.expectEqual("#xyzxyz", location.hash);
|
||||
testing.expectEqual('http://localhost:9582/src/tests/html/location.html#xyzxyz', location.href);
|
||||
|
||||
location.hash = "";
|
||||
testing.expectEqual("", location.hash);
|
||||
testing.expectEqual('http://localhost:9582/src/tests/html/location.html', location.href);
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user