www

commit d65796dfb070cf379f70ffa44fade1754d9d063f
parent 6de53ad37cd43dea592178d7496217738a1054a5
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue, 20 Mar 2012 18:07:12 -0400

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

Diffstat:
M
chrome/content/zotero/xpcom/attachments.js
 | 
22
+++-------------------

1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
@@ -225,30 +225,14 @@ Zotero.Attachments = new function(){
 		
 		// Save using a hidden browser
 		var nativeHandlerImport = function () {
-			var browser = Zotero.Browser.createHiddenBrowser();
-			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 browser = Zotero.HTTP.processDocuments(url, function() {
 				var importCallback = function (item) {
-					browser.removeEventListener("pageshow", onpageshow, false);
 					Zotero.Browser.deleteHiddenBrowser(browser);
 					if(callback) callback(item);
 				};
 				Zotero.Attachments.importFromDocument(browser.contentDocument,
 					sourceItemID, forceTitle, parentCollectionIDs, importCallback, libraryID);
-				imported = true;
-			};
-			browser.addEventListener("pageshow", onpageshow, false);
-			browser.loadURI(url);
+			}, undefined, undefined, true);
 		};
 		
 		// Save using remote web browser persist
@@ -397,7 +381,7 @@ Zotero.Attachments = new function(){
 		}
 		
 		if (mimeType) {
-			return process(mimeType);
+			return process(mimeType, Zotero.MIME.hasNativeHandler(mimeType));
 		}
 		else {
 			Zotero.MIME.getMIMETypeFromURL(url, function (mimeType, hasNativeHandler) {