From dd3acad06bde4d0d35ab28f1f5f7c437675e1709 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 21 Aug 2007 08:33:17 +0000
Subject: [PATCH] Add pref launchNonNativeFiles to launch PDF and other
 non-native files rather than displaying in-browser

---
 chrome/content/zotero/overlay.js | 14 +++++++++++---
 defaults/preferences/zotero.js   |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 4c9aebf59..1e712dfd6 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -1873,14 +1873,22 @@ var ZoteroPane = new function()
 		var file = attachment.getFile();
 		if (file) {
 			var mimeType = attachment.getAttachmentMimeType();
-			if (mimeType) {
+			// If no MIME type specified, try to detect again (I guess in case
+			// we've gotten smarter since the file was imported?)
+			if (!mimeType) {
+				var mimeType = Zotero.MIME.getMIMETypeFromFile(file);
 				var ext = Zotero.File.getExtension(file);
-				var internal = Zotero.MIME.hasInternalHandler(mimeType, ext);
+				
+				// TODO: update DB with new info
 			}
+			var ext = Zotero.File.getExtension(file);
+			var isNative = Zotero.MIME.hasNativeHandler(mimeType, ext);
+			var internal = Zotero.MIME.hasInternalHandler(mimeType, ext);
 			
 			var fileURL = attachment.getLocalFileURL();
 			
-			if (internal || Zotero.MIME.fileHasInternalHandler(file)) {
+			if (isNative ||
+					(internal && !Zotero.Prefs.get('launchNonNativeFiles'))) {
 				this.loadURI(fileURL, event, { attachmentID: itemID});
 			}
 			else {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index afaecd59e..5782f5e36 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -20,6 +20,7 @@ pref("extensions.zotero.fontSize", "1.0");
 pref("extensions.zotero.recursiveCollections", false);
 pref("extensions.zotero.attachmentRenameFormatString", '{%c - }{%y - }{%t{50}}');
 pref("extensions.zotero.capitalizeTitles", true);
+pref("extensions.zotero.launchNonNativeFiles", false);
 
 pref("extensions.zotero.lastCreatorFieldMode",0);
 pref("extensions.zotero.lastAbstractExpand",0);