From 0f15b42719f265cd28428dcda6d99a49f6d94f3b Mon Sep 17 00:00:00 2001 From: tophf Date: Wed, 12 Feb 2025 15:07:33 +0300 Subject: [PATCH] fix #1915: raciness of tab.url and soft nav --- src/background/navigation-manager.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/background/navigation-manager.js b/src/background/navigation-manager.js index 8c11fba6a1..096f983b7c 100644 --- a/src/background/navigation-manager.js +++ b/src/background/navigation-manager.js @@ -1,5 +1,5 @@ import '@/js/browser'; -import {kAboutBlank, kUrl} from '@/js/consts'; +import {kAboutBlank} from '@/js/consts'; import {CHROME, FIREFOX} from '@/js/ua'; import {chromeProtectsNTP, ownRoot} from '@/js/urls'; import {deepEqual} from '@/js/util'; @@ -50,17 +50,15 @@ async function onNavigation(navType, data) { const td = tabCache[tabId]; if (td && navType !== kCommitted) { const {frameId: f, url} = data; - if (td[kUrl]?.[f] !== url) { - const {documentId: d, frameType} = data; - sendTab(tabId, { - method: 'urlChanged', - top: !frameType && !f || frameType === 'outer_frame', - iid: !__.MV3 && td.iid?.[f] || 0, - url, - }, __.MV3 || d - ? {documentId: d} - : {frameId: f}); - } + const {documentId: d, frameType} = data; + sendTab(tabId, { + method: 'urlChanged', + top: !frameType && !f || frameType === 'outer_frame', + iid: !__.MV3 && td.iid?.[f] || 0, + url, + }, __.MV3 || d + ? {documentId: d} + : {frameId: f}); } for (const fn of onUrlChange) fn(data, navType); }