Fix mangled output from Zotero.Utilities.getAsyncInputStream()

Proper fix (as opposed to 5236d01791) for
https://forums.zotero.org/discussion/64022/5-0-beta-generate-report-is-often-garbled
This commit is contained in:
Dan Stillman 2017-01-30 13:33:23 -05:00
parent 10111dbd98
commit b073c3e680
2 changed files with 11 additions and 25 deletions

View file

@ -444,26 +444,12 @@ function ZoteroProtocolHandler() {
default:
this.contentType = 'text/html';
// DEBUG: Results in mangled reports
//
// https://forums.zotero.org/discussion/64022/5-0-beta-generate-report-is-often-garbled
/*return Zotero.Utilities.Internal.getAsyncInputStream(
Zotero.Report.HTML.listGenerator(items, combineChildItems),
function () {
return '<span style="color: red; font-weight: bold">Error generating report</span>';
}
);*/
Components.utils.import("resource://gre/modules/NetUtil.jsm");
var is = Zotero.Utilities.Internal.getAsyncInputStream(
return Zotero.Utilities.Internal.getAsyncInputStream(
Zotero.Report.HTML.listGenerator(items, combineChildItems),
function () {
return '<span style="color: red; font-weight: bold">Error generating report</span>';
}
);
var str = NetUtil.readInputStreamToString(is, is.available(), { charset: "UTF-8" });
return Zotero.Promise.resolve(str);
}
});
}