scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-28 01:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate Zotero.Promise#isPending() in dataObjects.js

Browse source
This commit is contained in:
Abe Jellinek 2025-07-02 11:44:13 -04:00 • committed by Dan Stillman
parent c4a0a760b1
commit ed00016caa
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
chrome/content/zotero/xpcom/data/dataObjects.js
View file

@ -55,7 +55,6 @@ Zotero.DataObjects = function () {
this._objectKeys = {};
this._objectIDs = {};
this._loadedLibraries = {};
this._loadPromise = null;
}
Zotero.DataObjects.prototype._ZDO_idOnly = false;
@ -192,16 +191,8 @@ Zotero.DataObjects.prototype.getAsync = async function (ids, options) {
// New object to load
if (toLoad.length) {
// Serialize loads
if (this._loadPromise && this._loadPromise.isPending()) {
await this._loadPromise;
}
let deferred = Zotero.Promise.defer();
this._loadPromise = deferred.promise;
let loaded = await this._load(null, toLoad, options);
for (let i=0; i<toLoad.length; i++) {
let id = toLoad[i];
let loaded = await this._loadSerial(null, toLoad, options);
for (let id of toLoad) {
let obj = loaded[id];
if (!obj) {
Zotero.debug(this._ZDO_Object + " " + id + " doesn't exist", 2);
@ -209,7 +200,6 @@ Zotero.DataObjects.prototype.getAsync = async function (ids, options) {
}
toReturn.push(obj);
}
deferred.resolve();
}
// If single id, return the object directly
@ -1208,7 +1198,7 @@ Zotero.DataObjects.prototype._load = async function (libraryID, ids, options) {
return loaded;
};
Zotero.DataObjects.prototype._loadSerial = Zotero.Utilities.Internal.serial(Zotero.DataObjects.prototype._load);
Zotero.DataObjects.prototype._getObjectForRow = function (row) {
return new Zotero[this._ZDO_Object];