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

Parse note content in reports as HTML instead of XML

Browse source 
And remove raw-markup fallback when not XML
This commit is contained in:
Dan Stillman 2017-01-31 01:23:10 -05:00
parent ae47ae28bd
commit 835003dd6d
1 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
chrome/content/zotero/xpcom/report.js
View file

@ -27,6 +27,9 @@
Zotero.Report = {}; Zotero.Report = {};
Zotero.Report.HTML = new function () { Zotero.Report.HTML = new function () {
let domParser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
.createInstance(Components.interfaces.nsIDOMParser);
this.listGenerator = function* (items, combineChildItems) { this.listGenerator = function* (items, combineChildItems) {
yield '<!DOCTYPE html>\n' yield '<!DOCTYPE html>\n'
+ '<html>\n' + '<html>\n'
@ -67,25 +70,13 @@ Zotero.Report.HTML = new function () {
if (obj['note']) { if (obj['note']) {
content += '\n\t\t\t'; content += '\n\t\t\t';
// If not valid XML, display notes with entities encoded let doc = domParser.parseFromString('<div>'
var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
.createInstance(Components.interfaces.nsIDOMParser);
var doc = parser.parseFromString('<div>'
+ obj.note + obj.note
// &nbsp; isn't valid in HTML
.replace(/&nbsp;/g, "&#160;")
// Strip control characters (for notes that were // Strip control characters (for notes that were
// added before item.setNote() started doing this) // added before item.setNote() started doing this)
.replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, "") .replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, "")
+ '</div>', "application/xml"); + '</div>', "text/html");
if (doc.documentElement.tagName == 'parsererror') { content += doc.body.innerHTML + '\n';
Zotero.debug(doc.documentElement.textContent, 2);
content += '<p class="plaintext">' + escapeXML(obj.note) + '</p>\n';
}
// Otherwise render markup normally
else {
content += obj.note + '\n';
}
} }
} }
@ -101,24 +92,13 @@ Zotero.Report.HTML = new function () {
for (let note of obj.reportChildren.notes) { for (let note of obj.reportChildren.notes) {
content += '\t\t\t\t\t<li id="item_' + note.key + '">\n'; content += '\t\t\t\t\t<li id="item_' + note.key + '">\n';
// If not valid XML, display notes with entities encoded let doc = domParser.parseFromString('<div>'
var parser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
.createInstance(Components.interfaces.nsIDOMParser);
var doc = parser.parseFromString('<div>'
+ note.note + note.note
.replace(/&nbsp;/g, "&#160;")
// Strip control characters (for notes that were // Strip control characters (for notes that were
// added before item.setNote() started doing this) // added before item.setNote() started doing this)
.replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, "") .replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, "")
+ '</div>', "application/xml"); + '</div>', "text/html");
if (doc.documentElement.tagName == 'parsererror') { content += doc.body.innerHTML + '\n';
Zotero.debug(doc.documentElement.textContent, 2);
content += '<p class="plaintext">' + escapeXML(note.note) + '</p>\n';
}
// Otherwise render markup normally
else {
content += note.note + '\n';
}
// Child note tags // Child note tags
content += _generateTagsList(note); content += _generateTagsList(note);