Merge branch '3.0'
Conflicts: chrome/content/zotero/xpcom/attachments.js chrome/content/zotero/xpcom/translation/translate_item.js install.rdf update.rdf
This commit is contained in:
commit
4caae896cf
14 changed files with 121 additions and 85 deletions
|
@ -479,21 +479,7 @@ function ChromeExtensionHandler() {
|
|||
|
||||
default:
|
||||
var content = Zotero.Report.generateHTMLDetails(items, combineChildItems);
|
||||
|
||||
// Serve invalid XML as text/html
|
||||
//
|
||||
// This is a temporary workaround until we figure out
|
||||
// something better.
|
||||
try {
|
||||
var xml = new XML(content.replace(/^<\!DOCTYPE [^>]+>\n/, '').trim());
|
||||
mimeType = 'application/xhtml+xml';
|
||||
}
|
||||
catch (e) {
|
||||
Zotero.debug(e);
|
||||
mimeType = 'text/html';
|
||||
}
|
||||
|
||||
format = 'html';
|
||||
mimeType = 'text/html';
|
||||
}
|
||||
}
|
||||
catch (e){
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue