diff --git a/browser/base/content/test/general/browser_backButtonFitts.js b/browser/base/content/test/general/browser_backButtonFitts.js index 5b08eb360139..996a155a79ba 100644 --- a/browser/base/content/test/general/browser_backButtonFitts.js +++ b/browser/base/content/test/general/browser_backButtonFitts.js @@ -22,7 +22,8 @@ add_task(async function() { let popStatePromise = BrowserTestUtils.waitForContentEvent( gBrowser.selectedBrowser, - "popstate" + "popstate", + true ); EventUtils.synthesizeMouseAtPoint(xPixel, yPixel, {}, window); await popStatePromise; diff --git a/browser/components/sessionstore/test/browser_async_duplicate_tab.js b/browser/components/sessionstore/test/browser_async_duplicate_tab.js index 3c57c1432742..3cf041ced599 100644 --- a/browser/components/sessionstore/test/browser_async_duplicate_tab.js +++ b/browser/components/sessionstore/test/browser_async_duplicate_tab.js @@ -21,7 +21,7 @@ add_task(async function test_duplicate() { docShell.chromeEventHandler.addEventListener( "hashchange", () => resolve(), - { once: true } + { once: true, capture: true } ); // Click the link. @@ -60,7 +60,7 @@ add_task(async function test_duplicate_remove() { docShell.chromeEventHandler.addEventListener( "hashchange", () => resolve(), - { once: true } + { once: true, capture: true } ); // Click the link. diff --git a/browser/components/sessionstore/test/browser_async_flushes.js b/browser/components/sessionstore/test/browser_async_flushes.js index 584cc092f61f..ad3b27ed4e33 100644 --- a/browser/components/sessionstore/test/browser_async_flushes.js +++ b/browser/components/sessionstore/test/browser_async_flushes.js @@ -25,7 +25,7 @@ add_task(async function test_flush() { docShell.chromeEventHandler.addEventListener( "hashchange", () => resolve(), - { once: true } + { once: true, capture: true } ); // Click the link. @@ -64,7 +64,7 @@ add_task(async function test_crash() { docShell.chromeEventHandler.addEventListener( "hashchange", () => resolve(), - { once: true } + { once: true, capture: true } ); // Click the link. @@ -107,7 +107,7 @@ add_task(async function test_remove() { docShell.chromeEventHandler.addEventListener( "hashchange", () => resolve(), - { once: true } + { once: true, capture: true } ); // Click the link. diff --git a/browser/components/sessionstore/test/content.js b/browser/components/sessionstore/test/content.js index c77427c9441c..67fa53e7b3b1 100644 --- a/browser/components/sessionstore/test/content.js +++ b/browser/components/sessionstore/test/content.js @@ -48,9 +48,13 @@ if (sessionHistory) { * to modify and query docShell data when running with multiple processes. */ -addEventListener("hashchange", function() { - sendAsyncMessage("ss-test:hashchange"); -}); +addEventListener( + "hashchange", + function() { + sendAsyncMessage("ss-test:hashchange"); + }, + true +); addMessageListener("ss-test:getStyleSheets", function(msg) { let sheets = content.document.styleSheets; diff --git a/browser/components/urlbar/tests/browser/browser_switchToTabHavingURI_aOpenParams.js b/browser/components/urlbar/tests/browser/browser_switchToTabHavingURI_aOpenParams.js index aa6360163973..6f9722776b75 100644 --- a/browser/components/urlbar/tests/browser/browser_switchToTabHavingURI_aOpenParams.js +++ b/browser/components/urlbar/tests/browser/browser_switchToTabHavingURI_aOpenParams.js @@ -17,7 +17,7 @@ add_task(async function test_ignoreFragment() { tabRefAboutHome.linkedBrowser, [], async function() { - await ContentTaskUtils.waitForEvent(this, "hashchange", false); + await ContentTaskUtils.waitForEvent(this, "hashchange", true); } ); switchTab("about:home#2", true, { diff --git a/docshell/test/mochitest/test_bug385434.html b/docshell/test/mochitest/test_bug385434.html index dc7c511749e7..8c3ea4a266d9 100644 --- a/docshell/test/mochitest/test_bug385434.html +++ b/docshell/test/mochitest/test_bug385434.html @@ -186,8 +186,8 @@ function* run_test() { "Event type should be 'hashchange'."); is(gSampleEvent.cancelable, false, "The hashchange event shouldn't be cancelable."); - is(gSampleEvent.bubbles, true, - "The hashchange event should bubble."); + is(gSampleEvent.bubbles, false, + "The hashchange event should not bubble."); /* * TEST 3 tests that: diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index 2a8ba106b695..d17fcecb210b 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -4243,8 +4243,6 @@ nsresult nsGlobalWindowInner::FireHashchange(const nsAString& aOldURL, NS_ENSURE_STATE(IsCurrentInnerWindow()); HashChangeEventInit init; - init.mBubbles = true; - init.mCancelable = false; init.mNewURL = aNewURL; init.mOldURL = aOldURL; @@ -4284,8 +4282,6 @@ nsresult nsGlobalWindowInner::DispatchSyncPopState() { NS_ENSURE_TRUE(result, NS_ERROR_FAILURE); RootedDictionary init(cx); - init.mBubbles = true; - init.mCancelable = false; init.mState = stateJSValue; RefPtr event = diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/hashchange_event.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/hashchange_event.html.ini deleted file mode 100644 index 50074f691ea7..000000000000 --- a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/hashchange_event.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[hashchange_event.html] - [Queue a task to fire hashchange event] - expected: FAIL - diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini deleted file mode 100644 index 7124dbe254fe..000000000000 --- a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[popstate_event.html] - [Queue a task to fire popstate event] - expected: FAIL - diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/scroll-to-fragid/004.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/scroll-to-fragid/004.html.ini deleted file mode 100644 index 90b9dc9074bf..000000000000 --- a/testing/web-platform/meta/html/browsers/browsing-the-web/scroll-to-fragid/004.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[004.html] - [Fragment Navigation: hashchange event] - expected: FAIL -