suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load item data in feed libraries before refreshing feeds

Browse Source
This commit is contained in:
Dan Stillman 2016-04-26 00:00:12 -04:00
parent a8e94a8cba
commit 55688a8104
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chrome/content/zotero/xpcom/data/feeds.js
View File

@ -204,6 +204,7 @@ Zotero.Feeds = new function() {
Zotero.debug("Running update for feeds: " + needUpdate.join(', ')); Zotero.debug("Running update for feeds: " + needUpdate.join(', '));
for (let i=0; i<needUpdate.length; i++) { for (let i=0; i<needUpdate.length; i++) {
let feed = Zotero.Feeds.get(needUpdate[i]); let feed = Zotero.Feeds.get(needUpdate[i]);
yield feed.waitForDataLoad('item');
yield feed._updateFeed(); yield feed._updateFeed();
} }

3
chrome/content/zotero/xpcom/data/library.js
View File

@ -371,6 +371,9 @@ Zotero.Library.prototype.setDataLoaded = function (objectType) {
this._dataLoadedDeferreds[objectType].resolve(); this._dataLoadedDeferreds[objectType].resolve();
}; };
/**
* Wait for a given data type to load, loading it now if necessary
*/
Zotero.Library.prototype.waitForDataLoad = Zotero.Promise.coroutine(function* (objectType) { Zotero.Library.prototype.waitForDataLoad = Zotero.Promise.coroutine(function* (objectType) {
if (this.getDataLoaded(objectType)) return; if (this.getDataLoaded(objectType)) return;

3
chrome/content/zotero/xpcom/zotero.js
View File

@ -631,7 +631,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
yield Zotero.Relations.init(); yield Zotero.Relations.init();
yield Zotero.Feeds.init(); yield Zotero.Feeds.init();
// Load all library data except for items // Load all library data except for items, which are loaded when libraries are first
// clicked on or if otherwise necessary
yield Zotero.Promise.each( yield Zotero.Promise.each(
Zotero.Libraries.getAll(), Zotero.Libraries.getAll(),
library => Zotero.Promise.coroutine(function* () { library => Zotero.Promise.coroutine(function* () {