From e6aba9b8790248ae08b8e369c30f706cee482962 Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Wed, 2 Jul 2025 11:33:36 -0400 Subject: [PATCH] fx140: Fix folder import --- chrome/content/zotero/fileInterface.js | 2 +- .../zotero/import/{folderImport.js => folderImport.mjs} | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) rename chrome/content/zotero/import/{folderImport.js => folderImport.mjs} (96%) diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index 79c17fe151..1dd4a25a15 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -452,7 +452,7 @@ var Zotero_File_Interface = new function () { translation.relinkOnly = options.relinkOnly; } else if (options.folder) { - Cu.import("chrome://zotero/content/import/folderImport.js"); + const { Zotero_Import_Folder } = ChromeUtils.importESModule("chrome://zotero/content/import/folderImport.js"); translation = new Zotero_Import_Folder({ folder: options.folder, recreateStructure: options.recreateStructure, diff --git a/chrome/content/zotero/import/folderImport.js b/chrome/content/zotero/import/folderImport.mjs similarity index 96% rename from chrome/content/zotero/import/folderImport.js rename to chrome/content/zotero/import/folderImport.mjs index aeb56dfd6e..ecb15746f8 100644 --- a/chrome/content/zotero/import/folderImport.js +++ b/chrome/content/zotero/import/folderImport.mjs @@ -1,5 +1,3 @@ -var EXPORTED_SYMBOLS = ["Zotero_Import_Folder"]; // eslint-disable-line no-unused-vars - Services.scriptloader.loadSubScript("chrome://zotero/content/include.js"); // matches "*" and "?" wildcards of a glob pattern, case-insensitive @@ -44,7 +42,7 @@ const findItemByHash = async (libraryID, hash) => { return null; }; -class Zotero_Import_Folder { // eslint-disable-line camelcase,no-unused-vars +export class Zotero_Import_Folder { constructor({ mimeTypes = ['application/pdf'], fileTypes, folder, libraryID, recreateStructure }) { this.folder = folder; this.libraryID = libraryID; @@ -130,7 +128,7 @@ class Zotero_Import_Folder { // eslint-disable-line camelcase,no-unused-vars if (prevParentCollectionID) { parentCollection.parentID = prevParentCollectionID; } - await parentCollection.saveTx({ skipSelect: true }); //eslint-disable-line no-await-in-loop + await parentCollection.saveTx({ skipSelect: true }); prevParentCollectionID = parentCollection.id; } }