From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- browser/components/downloads/DownloadsCommon.sys.mjs | 4 ++-- browser/components/downloads/DownloadsViewUI.sys.mjs | 2 +- .../components/downloads/DownloadsViewableInternally.sys.mjs | 2 +- browser/components/downloads/content/allDownloadsView.js | 6 +++--- .../components/downloads/content/contentAreaDownloadsView.js | 2 +- browser/components/downloads/content/downloads.js | 12 +++++++++--- .../downloads/test/browser/browser_download_overwrite.js | 6 +++--- .../test/browser/browser_downloads_panel_dontshow.js | 2 +- .../downloads/test/browser/browser_downloads_panel_opens.js | 2 +- .../test/browser/browser_iframe_gone_mid_download.js | 2 +- .../downloads/test/browser/browser_image_mimetype_issues.js | 6 +++--- .../downloads/test/browser/browser_library_clearall.js | 2 +- .../downloads/test/unit/test_DownloadsCommon_isFileOfType.js | 2 +- 13 files changed, 28 insertions(+), 22 deletions(-) (limited to 'browser/components/downloads') diff --git a/browser/components/downloads/DownloadsCommon.sys.mjs b/browser/components/downloads/DownloadsCommon.sys.mjs index a0cbd2f8d8..776d219ae7 100644 --- a/browser/components/downloads/DownloadsCommon.sys.mjs +++ b/browser/components/downloads/DownloadsCommon.sys.mjs @@ -696,7 +696,7 @@ export var DownloadsCommon = { message = s.unblockTypePotentiallyUnwanted2; break; case lazy.Downloads.Error.BLOCK_VERDICT_INSECURE: - message = s.unblockInsecure2; + message = s.unblockInsecure3; break; default: // Assume Downloads.Error.BLOCK_VERDICT_MALWARE @@ -1166,7 +1166,7 @@ const DownloadsViewPrototype = { * * @note Subclasses should override this. */ - onDownloadStateChanged(download) { + onDownloadStateChanged() { throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); }, diff --git a/browser/components/downloads/DownloadsViewUI.sys.mjs b/browser/components/downloads/DownloadsViewUI.sys.mjs index 9c6bd17d63..ffcd3b61fa 100644 --- a/browser/components/downloads/DownloadsViewUI.sys.mjs +++ b/browser/components/downloads/DownloadsViewUI.sys.mjs @@ -888,7 +888,7 @@ DownloadsViewUI.DownloadElementShell.prototype = { case lazy.Downloads.Error.BLOCK_VERDICT_INSECURE: return [ s.blockedPotentiallyInsecure, - [s.unblockInsecure2, s.unblockTip2], + [s.unblockInsecure3, s.unblockTip2], ]; case lazy.Downloads.Error.BLOCK_VERDICT_POTENTIALLY_UNWANTED: return [ diff --git a/browser/components/downloads/DownloadsViewableInternally.sys.mjs b/browser/components/downloads/DownloadsViewableInternally.sys.mjs index f9c77168b1..47250c0159 100644 --- a/browser/components/downloads/DownloadsViewableInternally.sys.mjs +++ b/browser/components/downloads/DownloadsViewableInternally.sys.mjs @@ -67,7 +67,7 @@ export let DownloadsViewableInternally = { this._updateAllHandlers(); // Register the check for use in DownloadIntegration - lazy.Integration.downloads.register(base => ({ + lazy.Integration.downloads.register(() => ({ shouldViewDownloadInternally: this._shouldViewDownloadInternally.bind(this), })); diff --git a/browser/components/downloads/content/allDownloadsView.js b/browser/components/downloads/content/allDownloadsView.js index b42e4ec118..08f8bfcb5f 100644 --- a/browser/components/downloads/content/allDownloadsView.js +++ b/browser/components/downloads/content/allDownloadsView.js @@ -734,7 +734,7 @@ DownloadsPlacesView.prototype = { goUpdateCommand("downloadsCmd_clearDownloads"); }, - onContextMenu(aEvent) { + onContextMenu() { let element = this._richlistbox.selectedItem; if (!element || !element._shell) { return false; @@ -910,7 +910,7 @@ function goUpdateDownloadCommands() { document.addEventListener("DOMContentLoaded", function () { let richListBox = document.getElementById("downloadsListBox"); - richListBox.addEventListener("scroll", function (event) { + richListBox.addEventListener("scroll", function () { return this._placesView.onScroll(); }); richListBox.addEventListener("keypress", function (event) { @@ -938,7 +938,7 @@ document.addEventListener("DOMContentLoaded", function () { dropNode.addEventListener("drop", function (event) { richListBox._placesView.onDrop(event); }); - richListBox.addEventListener("select", function (event) { + richListBox.addEventListener("select", function () { this._placesView.onSelect(); }); richListBox.addEventListener("focus", goUpdateDownloadCommands); diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 62c81fc147..3f9c4ad956 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -29,7 +29,7 @@ var ContentAreaDownloadsView = { { once: true } ); let view = new DownloadsPlacesView(box, true, suppressionFlag); - document.addEventListener("visibilitychange", aEvent => { + document.addEventListener("visibilitychange", () => { let indicator = DownloadsCommon.getIndicatorData(window); if (document.visibilityState === "visible") { indicator.attentionSuppressed |= suppressionFlag; diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js index 778b995e93..b420d48db6 100644 --- a/browser/components/downloads/content/downloads.js +++ b/browser/components/downloads/content/downloads.js @@ -528,7 +528,10 @@ var DownloadsPanel = { }, _startWatchingForSpammyDownloadActivation() { - Services.els.addSystemEventListener(window, "keydown", this, true); + window.addEventListener("keydown", this, { + capture: true, + mozSystemGroup: true, + }); }, _lastBeepTime: 0, @@ -546,7 +549,10 @@ var DownloadsPanel = { }, _stopWatchingForSpammyDownloadActivation() { - Services.els.removeSystemEventListener(window, "keydown", this, true); + window.removeEventListener("keydown", this, { + capture: true, + mozSystemGroup: true, + }); }, /** @@ -1458,7 +1464,7 @@ var DownloadsSummary = { * @param aEvent * The click event being handled. */ - onClick(aEvent) { + onClick() { DownloadsPanel.showDownloadsHistory(); }, diff --git a/browser/components/downloads/test/browser/browser_download_overwrite.js b/browser/components/downloads/test/browser/browser_download_overwrite.js index 7be16aa565..b1de07b5ed 100644 --- a/browser/components/downloads/test/browser/browser_download_overwrite.js +++ b/browser/components/downloads/test/browser/browser_download_overwrite.js @@ -5,11 +5,11 @@ const TEST_ROOT = getRootDirectory(gTestPath).replace( "chrome://mochitests/content", - "http://example.com" + "https://example.com" ); var MockFilePicker = SpecialPowers.MockFilePicker; -MockFilePicker.init(window); +MockFilePicker.init(window.browsingContext); Services.scriptloader.loadSubScript( "chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockTransfer.js", @@ -31,7 +31,7 @@ add_setup(async function () { let destDir = gTestTargetFile.parent; MockFilePicker.displayDirectory = destDir; - MockFilePicker.showCallback = function (fp) { + MockFilePicker.showCallback = function () { MockFilePicker.setFiles([gTestTargetFile]); return MockFilePicker.returnOK; }; diff --git a/browser/components/downloads/test/browser/browser_downloads_panel_dontshow.js b/browser/components/downloads/test/browser/browser_downloads_panel_dontshow.js index 28c7bc302f..240c90048e 100644 --- a/browser/components/downloads/test/browser/browser_downloads_panel_dontshow.js +++ b/browser/components/downloads/test/browser/browser_downloads_panel_dontshow.js @@ -2,7 +2,7 @@ // download occurs but not when a user manually saves a page. let MockFilePicker = SpecialPowers.MockFilePicker; -MockFilePicker.init(window); +MockFilePicker.init(window.browsingContext); async function promiseDownloadFinished(list) { return new Promise(resolve => { diff --git a/browser/components/downloads/test/browser/browser_downloads_panel_opens.js b/browser/components/downloads/test/browser/browser_downloads_panel_opens.js index 7c44939e59..f8e034aaa5 100644 --- a/browser/components/downloads/test/browser/browser_downloads_panel_opens.js +++ b/browser/components/downloads/test/browser/browser_downloads_panel_opens.js @@ -2,7 +2,7 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ let { MockFilePicker } = SpecialPowers; -MockFilePicker.init(window); +MockFilePicker.init(window.browsingContext); registerCleanupFunction(() => MockFilePicker.cleanup()); /** diff --git a/browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js b/browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js index a1b82fb9c2..0e4b51a1a6 100644 --- a/browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js +++ b/browser/components/downloads/test/browser/browser_iframe_gone_mid_download.js @@ -22,7 +22,7 @@ function test_deleted_iframe(perSitePref, windowOptions = {}) { ok(iframe.contentWindow, "iframe should have a window"); let gDownloadLastDir = new DownloadLastDir(iframe.contentWindow); let cw = iframe.contentWindow; - let promiseIframeWindowGone = new Promise((resolve, reject) => { + let promiseIframeWindowGone = new Promise(resolve => { Services.obs.addObserver(function obs(subject, topic) { if (subject == cw) { Services.obs.removeObserver(obs, topic); diff --git a/browser/components/downloads/test/browser/browser_image_mimetype_issues.js b/browser/components/downloads/test/browser/browser_image_mimetype_issues.js index b893a26d89..0f6afef9b4 100644 --- a/browser/components/downloads/test/browser/browser_image_mimetype_issues.js +++ b/browser/components/downloads/test/browser/browser_image_mimetype_issues.js @@ -9,7 +9,7 @@ const TEST_ROOT = getRootDirectory(gTestPath).replace( ); var MockFilePicker = SpecialPowers.MockFilePicker; -MockFilePicker.init(window); +MockFilePicker.init(window.browsingContext); /* * Popular websites implement image optimization as serving files with @@ -98,7 +98,7 @@ add_task(async function test_save_link_webp_with_jpeg_extension() { add_task(async function test_save_page_on_image_document() { await BrowserTestUtils.withNewTab( `${TEST_ROOT}/not-really-a-jpeg.jpeg?convert=webp`, - async browser => { + async () => { await new Promise(resolve => { MockFilePicker.showCallback = function (fp) { ok( @@ -119,7 +119,7 @@ add_task(async function test_save_page_on_image_document() { * get it replaced with .jpeg. */ add_task(async function test_save_page_on_JPEG_image_document() { - await BrowserTestUtils.withNewTab(`${TEST_ROOT}/blank.JPG`, async browser => { + await BrowserTestUtils.withNewTab(`${TEST_ROOT}/blank.JPG`, async () => { await new Promise(resolve => { MockFilePicker.showCallback = function (fp) { ok( diff --git a/browser/components/downloads/test/browser/browser_library_clearall.js b/browser/components/downloads/test/browser/browser_library_clearall.js index 022d1b6977..e96ea9d3e3 100644 --- a/browser/components/downloads/test/browser/browser_library_clearall.js +++ b/browser/components/downloads/test/browser/browser_library_clearall.js @@ -22,7 +22,7 @@ function waitForChildren(element, callback) { }); } -async function waitForChildrenLength(element, length, callback) { +async function waitForChildrenLength(element, length) { if (element.childElementCount != length) { await waitForChildren(element, () => element.childElementCount == length); } diff --git a/browser/components/downloads/test/unit/test_DownloadsCommon_isFileOfType.js b/browser/components/downloads/test/unit/test_DownloadsCommon_isFileOfType.js index d965ac264a..c07a44673c 100644 --- a/browser/components/downloads/test/unit/test_DownloadsCommon_isFileOfType.js +++ b/browser/components/downloads/test/unit/test_DownloadsCommon_isFileOfType.js @@ -120,7 +120,7 @@ for (let testData of TESTCASES) { /** * Sanity test the DownloadsCommon.isFileOfType method with test parameters */ -async function test_isFileOfType({ name, typeArg, downloadProps, expected }) { +async function test_isFileOfType({ typeArg, downloadProps, expected }) { let download, result; if (downloadProps) { let downloadData = { -- cgit v1.2.3