scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-03 02:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Migrate Zotero.Promise#cancel() in feeds.js

Browse source
This commit is contained in:
Abe Jellinek 2025-07-02 11:01:14 -04:00
parent 692312b419
commit c3a9ffb574
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
chrome/content/zotero/xpcom/data/feeds.js
View file

@ -68,11 +68,8 @@ Zotero.Feeds = new function () {
};
this.uninit = function () {
// Cancel initialization if in progress
if (_initPromise) {
// FIXME: fx140: replace call to Zotero.Promise instance method 'cancel()'
_initPromise.cancel();
}
// TODO: fx140: We used to explicitly cancel the Bluebird _initPromise here
// Is it OK to let it complete?
};
this._cache = null;
@ -277,28 +274,22 @@ Zotero.Feeds = new function () {
var nextCheck = await Zotero.DB.valueQueryAsync(sql);
if (this._nextFeedCheck) {
this._nextFeedCheck.cancel();
clearTimeout(this._nextFeedCheck);
this._nextFeedCheck = null;
}
if (nextCheck !== false) {
nextCheck = nextCheck > 0 ? nextCheck * 1000 : 0;
Zotero.debug("Next feed check in " + (nextCheck / 1000) + " seconds");
this._nextFeedCheck = Zotero.Promise.delay(nextCheck);
Promise.all([this._nextFeedCheck, globalFeedCheckDelay])
.then(() => {
this._nextFeedCheck = setTimeout(async () => {
await globalFeedCheckDelay;
this._nextFeedCheck = null;
globalFeedCheckDelay = Zotero.Promise.delay(60000); // Don't perform auto-updates more than once per minute
return this.updateFeeds()
})
.catch(e => {
if (e instanceof Zotero.Promise.CancellationError) {
Zotero.debug('Next update check cancelled');
return;
}
throw e;
});
} else {
await this.updateFeeds();
}, nextCheck);
}
else {
Zotero.debug("No feeds with auto-update");
}
};
@ -309,7 +300,7 @@ Zotero.Feeds = new function () {
return;
}
if (this._nextFeedCheck) {
this._nextFeedCheck.cancel();
clearTimeout(this._nextFeedCheck);
this._nextFeedCheck = null;
}
_updating = true;