From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- dom/filesystem/compat/tests/script_entries.js | 4 ++-- dom/filesystem/compat/tests/test_basic.html | 18 +++++++++--------- dom/filesystem/tests/script_fileList.js | 4 ++-- dom/filesystem/tests/script_promptHandler.js | 6 +++--- dom/filesystem/tests/test_basic.html | 2 +- dom/filesystem/tests/test_webkitdirectory.html | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'dom/filesystem') diff --git a/dom/filesystem/compat/tests/script_entries.js b/dom/filesystem/compat/tests/script_entries.js index 7f52fe6bf2..74f3ee18bc 100644 --- a/dom/filesystem/compat/tests/script_entries.js +++ b/dom/filesystem/compat/tests/script_entries.js @@ -3,7 +3,7 @@ Cu.importGlobalProperties(["File", "Directory"]); var tmpFile, tmpDir; -addMessageListener("entries.open", function (e) { +addMessageListener("entries.open", function () { tmpFile = Services.dirsvc .QueryInterface(Ci.nsIProperties) .get("TmpD", Ci.nsIFile); @@ -40,7 +40,7 @@ addMessageListener("entries.open", function (e) { }); }); -addMessageListener("entries.delete", function (e) { +addMessageListener("entries.delete", function () { tmpFile.remove(true); tmpDir.remove(true); sendAsyncMessage("entries.deleted"); diff --git a/dom/filesystem/compat/tests/test_basic.html b/dom/filesystem/compat/tests/test_basic.html index 4ad0c37d67..552827eb4f 100644 --- a/dom/filesystem/compat/tests/test_basic.html +++ b/dom/filesystem/compat/tests/test_basic.html @@ -168,7 +168,7 @@ function test_directoryEntry_getFile_simple() { function(e) { is(e.name, "foo.txt", "We have the right FileEntry."); test_getParent(e, directoryEntry, /* nested */ false); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -178,7 +178,7 @@ function test_directoryEntry_getFile_deep() { function(e) { is(e.name, "bar..txt", "We have the right FileEntry."); test_getParent(e, directoryEntry, /* nested */ true); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -228,7 +228,7 @@ function test_directoryEntry_getDirectory_simple() { function(e) { is(e.name, "subdir", "We have the right DirectoryEntry."); test_getParent(e, directoryEntry, /* nested */ false); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -238,7 +238,7 @@ function test_directoryEntry_getDirectory_deep() { function(e) { is(e.name, "subsubdir", "We have the right DirectoryEntry."); test_getParent(e, directoryEntry, /* nested */ true); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -308,7 +308,7 @@ function test_root_getFile_simple() { function(e) { is(e.name, fileEntry.name, "We have the right FileEntry."); next(); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -318,7 +318,7 @@ function test_root_getFile_deep() { function(e) { is(e.name, "bar..txt", "We have the right FileEntry."); next(); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -368,7 +368,7 @@ function test_root_getDirectory_simple() { function(e) { is(e.name, directoryEntry.name, "We have the right DirectoryEntry."); next(); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -378,7 +378,7 @@ function test_root_getDirectory_deep() { function(e) { is(e.name, "subsubdir", "We have the right DirectoryEntry."); next(); - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } @@ -402,7 +402,7 @@ function test_getParent(entry, parentEntry, nested) { } else { test_getParent(e, parentEntry, false); } - }, function(e) { + }, function() { ok(false, "This should not happen."); }); } diff --git a/dom/filesystem/tests/script_fileList.js b/dom/filesystem/tests/script_fileList.js index 47438aa7b3..2730a96261 100644 --- a/dom/filesystem/tests/script_fileList.js +++ b/dom/filesystem/tests/script_fileList.js @@ -153,7 +153,7 @@ addMessageListener("dir.open", function (e) { }); }); -addMessageListener("file.open", function (e) { +addMessageListener("file.open", function () { var testFile = Services.dirsvc .QueryInterface(Ci.nsIProperties) .get("ProfD", Ci.nsIFile); @@ -164,7 +164,7 @@ addMessageListener("file.open", function (e) { }); }); -addMessageListener("symlink.open", function (e) { +addMessageListener("symlink.open", function () { let testDir = createTestFile(); let testFile = testDir.clone(); testFile.append("subdir"); diff --git a/dom/filesystem/tests/script_promptHandler.js b/dom/filesystem/tests/script_promptHandler.js index ed3bda7404..235842b455 100644 --- a/dom/filesystem/tests/script_promptHandler.js +++ b/dom/filesystem/tests/script_promptHandler.js @@ -2,17 +2,17 @@ let dialogObserverTopic = "common-dialog-loaded"; -function dialogObserver(subj, topic, data) { +function dialogObserver(subj) { subj.document.querySelector("dialog").acceptDialog(); sendAsyncMessage("promptAccepted"); } -addMessageListener("init", message => { +addMessageListener("init", () => { Services.obs.addObserver(dialogObserver, dialogObserverTopic); sendAsyncMessage("initDone"); }); -addMessageListener("cleanup", message => { +addMessageListener("cleanup", () => { Services.obs.removeObserver(dialogObserver, dialogObserverTopic); sendAsyncMessage("cleanupDone"); }); diff --git a/dom/filesystem/tests/test_basic.html b/dom/filesystem/tests/test_basic.html index b4daea79c9..a0464f631e 100644 --- a/dom/filesystem/tests/test_basic.html +++ b/dom/filesystem/tests/test_basic.html @@ -40,7 +40,7 @@ function create_fileList(aPath) { script.sendAsyncMessage("dir.open", { path: aPath }); } -function test_simpleFilePicker(aPath) { +function test_simpleFilePicker() { var url = SimpleTest.getTestFileURL("script_fileList.js"); var script = SpecialPowers.loadChromeScript(url); diff --git a/dom/filesystem/tests/test_webkitdirectory.html b/dom/filesystem/tests/test_webkitdirectory.html index 50080ad7ba..982887cbcf 100644 --- a/dom/filesystem/tests/test_webkitdirectory.html +++ b/dom/filesystem/tests/test_webkitdirectory.html @@ -48,7 +48,7 @@ function populateInputFile(aInputFile) { var script = SpecialPowers.loadChromeScript(url); var MockFilePicker = SpecialPowers.MockFilePicker; - MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); + MockFilePicker.init(SpecialPowers.wrap(window).browsingContext, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); async function onOpened(message) { MockFilePicker.useDirectory(message.dir); @@ -134,7 +134,7 @@ async function test_individualSymlink(aInputFile) { // -- Have the picker pick it var MockFilePicker = SpecialPowers.MockFilePicker; - MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeOpen); + MockFilePicker.init(SpecialPowers.wrap(window).browsingContext, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeOpen); MockFilePicker.displayDirectory = dir; let pickerShown = new Promise(resolve => { @@ -186,7 +186,7 @@ function test_changeDataWhileWorking() { var script = SpecialPowers.loadChromeScript(url); var MockFilePicker = SpecialPowers.MockFilePicker; - MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); + MockFilePicker.init(SpecialPowers.wrap(window).browsingContext, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); let promptHandled; // Let's start retrieving the root nsIFile object @@ -203,7 +203,7 @@ function test_changeDataWhileWorking() { // input.click() pointing to the root dir .then(async function(aDir) { MockFilePicker.cleanup(); - MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); + MockFilePicker.init(SpecialPowers.wrap(window).browsingContext, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); MockFilePicker.useDirectory(aDir); var input = document.getElementById("inputFileDirectoryChange"); @@ -228,7 +228,7 @@ function test_changeDataWhileWorking() { // Now let's click again and wait for onchange. .then(async function(aDir) { MockFilePicker.cleanup(); - MockFilePicker.init(window, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); + MockFilePicker.init(SpecialPowers.wrap(window).browsingContext, "A Mock File Picker", SpecialPowers.Ci.nsIFilePicker.modeGetFolder); MockFilePicker.useDirectory(aDir); let input = document.getElementById("inputFileDirectoryChange"); -- cgit v1.2.3