www

commit 82d00a4e7ab9ed6bbe00d4e7cdc5b689c1329c5a
parent b109279a17f2bbd3f4266740f992db99c3e6fbac
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 13 May 2016 15:46:19 -0400

Change some instances of attachmentMIMEType to attachmentContentType

Diffstat:
M
chrome/content/zotero/locateMenu.js
 | 
6
+++---
M
chrome/content/zotero/xpcom/annotate.js
 | 
6
+++---

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/locateMenu.js b/chrome/content/zotero/locateMenu.js
@@ -507,9 +507,9 @@ var Zotero_LocateMenu = new function() {
 					var path = yield attachment.getFilePathAsync();
 					if (path) {
 						var ext = Zotero.File.getExtension(Zotero.File.pathToFile(path));
-						if(!attachment.attachmentMIMEType || 
-							Zotero.MIME.hasNativeHandler(attachment.attachmentMIMEType, ext) ||
-							!Zotero.MIME.hasInternalHandler(attachment.attachmentMIMEType, ext)) {
+						if(!attachment.attachmentContentType ||
+							Zotero.MIME.hasNativeHandler(attachment.attachmentContentType, ext) ||
+							!Zotero.MIME.hasInternalHandler(attachment.attachmentContentType, ext)) {
 							return false;
 						}
 						return attachment;
diff --git a/chrome/content/zotero/xpcom/annotate.js b/chrome/content/zotero/xpcom/annotate.js
@@ -64,10 +64,10 @@ Zotero.Annotate = new function() {
 		if (m) {
 			var id = m[1];
 			var item = Zotero.Items.get(id);
-			var mimeType = item.attachmentMIMEType;
-			var file = item.getFile();
+			var contentType = item.attachmentContentType;
+			var file = item.getFilePath();
 			var ext = Zotero.File.getExtension(file);
-			if (mimeType == 'text/plain' || !Zotero.MIME.hasNativeHandler(mimeType, ext)) {
+			if (contentType == 'text/plain' || !Zotero.MIME.hasNativeHandler(contentType, ext)) {
 				return false;
 			}
 			return id;