mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix error trying to load old snapshot annotations

Browse source
This commit is contained in:
Dan Stillman 2016-04-16 16:49:48 -04:00
parent d8850b25c2
commit 67f358df4b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/annotate.js
View file

@ -751,16 +751,16 @@ Zotero.Annotations.prototype.save = function() {
/**
* Loads annotations from DB
*/
Zotero.Annotations.prototype.load = function() {
Zotero.Annotations.prototype.load = Zotero.Promise.coroutine(function* () {
// load annotations
var rows = Zotero.DB.query("SELECT * FROM annotations WHERE itemID = ?", [this.itemID]);
var rows = yield Zotero.DB.queryAsync("SELECT * FROM annotations WHERE itemID = ?", [this.itemID]);
for each(var row in rows) {
var annotation = this.createAnnotation();
annotation.initWithDBRow(row);
}
// load highlights
var rows = Zotero.DB.query("SELECT * FROM highlights WHERE itemID = ?", [this.itemID]);
var rows = yield Zotero.DB.queryAsync("SELECT * FROM highlights WHERE itemID = ?", [this.itemID]);
for each(var row in rows) {
try {
var highlight = new Zotero.Highlight(this);
@ -770,7 +770,7 @@ Zotero.Annotations.prototype.load = function() {
Zotero.debug("Annotate: could not load highlight");
}
}
}
});
/**
* Expands annotations if any are collapsed, or collapses highlights if all are expanded