Skip to content

Commit 6c6435c

Browse files
committed
apply suggestions from review
1 parent b25cbbd commit 6c6435c

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

src/glide/browser/base/content/browser.mts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,13 +912,17 @@ class GlideBrowserClass {
912912
return; // ignore iframes etc.
913913
}
914914

915+
if (location.schemeIs("about") && location.spec === "about:blank") {
916+
return;
917+
}
918+
915919
GlideBrowser._log.debug("onLocationChange - clearing buffer");
916920
await GlideBrowser.clear_buffer();
917921

918922
const current_tab = gBrowser.selectedTab;
919923

920924
if (current_tab) {
921-
const is_tab_switch = this.$last_selected_tab !== null && this.$last_selected_tab !== current_tab;
925+
const is_tab_switch = this.$last_selected_tab == null || this.$last_selected_tab !== current_tab;
922926

923927
GlideBrowser._log.debug("TabEnter check:", {
924928
last_tab: this.$last_selected_tab,

src/glide/browser/base/content/test/autocmds/browser_autocmds.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -538,23 +538,23 @@ add_task(async function test_tabenter_only_fires_on_tab_switch() {
538538
});
539539

540540
await BrowserTestUtils.withNewTab(INPUT_TEST_URI, async _ => {
541-
await waiter(() => glide.g.calls).isjson(["urlenter"]);
542-
is(num_calls(), 1, "Initial navigation should only trigger UrlEnter, not TabEnter");
541+
await waiter(() => glide.g.calls).isjson(["tabenter", "urlenter"]);
542+
is(num_calls(), 2, "Initial navigation should trigger both TabEnter and UrlEnter");
543543

544544
const tab1 = gBrowser.selectedTab;
545545

546546
BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, INPUT_TEST_URI + "?navigate");
547547
await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
548-
await waiter(() => glide.g.calls).isjson(["urlenter", "urlenter"]);
549-
is(num_calls(), 2, "Same-tab navigation should only trigger UrlEnter");
548+
await waiter(() => glide.g.calls).isjson(["tabenter", "urlenter", "urlenter"]);
549+
is(num_calls(), 3, "Same-tab navigation should only trigger UrlEnter");
550550

551551
await BrowserTestUtils.withNewTab("about:mozilla", async _ => {
552552
await sleep_frames(5);
553-
is(num_calls(), 2, "Opening non-matching page should not trigger any autocmd");
553+
is(num_calls(), 3, "Opening non-matching page should not trigger any autocmd");
554554

555555
await BrowserTestUtils.switchTab(gBrowser, tab1);
556-
await waiter(() => glide.g.calls).isjson(["urlenter", "urlenter", "tabenter", "urlenter"]);
557-
is(num_calls(), 4, "Switching tabs should trigger both TabEnter and UrlEnter");
556+
await waiter(() => glide.g.calls).isjson(["tabenter", "urlenter", "urlenter", "tabenter", "urlenter"]);
557+
is(num_calls(), 5, "Switching tabs should trigger both TabEnter and UrlEnter");
558558
});
559559
});
560560
});

0 commit comments

Comments
 (0)