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

Use importFromDocument when MIME types are explicitly specified, if the document can be handled internally

Browse source
This commit is contained in:
Simon Kornblith 2012-03-20 18:07:12 -04:00
parent 6de53ad37c
commit d65796dfb0
1 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
chrome/content/zotero/xpcom/attachments.js
View file

@ -225,30 +225,14 @@ Zotero.Attachments = new function(){
// Save using a hidden browser // Save using a hidden browser
var nativeHandlerImport = function () { var nativeHandlerImport = function () {
var browser = Zotero.Browser.createHiddenBrowser(); var browser = Zotero.HTTP.processDocuments(url, function() {
if(cookieSandbox) cookieSandbox.attachToBrowser(browser);
var imported = false;
var onpageshow = function() {
// ignore spurious about:blank loads
if(browser.contentDocument.location.href == "about:blank") return;
// pageshow can be triggered multiple times on some pages,
// so make sure we only import once
// (https://www.zotero.org/trac/ticket/795)
if (imported) {
return;
}
var importCallback = function (item) { var importCallback = function (item) {
browser.removeEventListener("pageshow", onpageshow, false);
Zotero.Browser.deleteHiddenBrowser(browser); Zotero.Browser.deleteHiddenBrowser(browser);
if(callback) callback(item); if(callback) callback(item);
}; };
Zotero.Attachments.importFromDocument(browser.contentDocument, Zotero.Attachments.importFromDocument(browser.contentDocument,
sourceItemID, forceTitle, parentCollectionIDs, importCallback, libraryID); sourceItemID, forceTitle, parentCollectionIDs, importCallback, libraryID);
imported = true; }, undefined, undefined, true);
};
browser.addEventListener("pageshow", onpageshow, false);
browser.loadURI(url);
}; };
// Save using remote web browser persist // Save using remote web browser persist
@ -397,7 +381,7 @@ Zotero.Attachments = new function(){
} }
if (mimeType) { if (mimeType) {
return process(mimeType); return process(mimeType, Zotero.MIME.hasNativeHandler(mimeType));
} }
else { else {
Zotero.MIME.getMIMETypeFromURL(url, function (mimeType, hasNativeHandler) { Zotero.MIME.getMIMETypeFromURL(url, function (mimeType, hasNativeHandler) {