www

commit eb5711c87cb6b81da8f5ca27e1b1e62bc057a4b4
parent 0432da1d258a0fb5ad06d11f1d84e6d77a276b01
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 13 Feb 2011 18:46:34 +0000

Fix some deprecated calls


Diffstat:
M
chrome/content/zotero/xpcom/translation/item_local.js
 | 
6
+++---
M
chrome/content/zotero/zoteroPane.js
 | 
3
+--

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/item_local.js b/chrome/content/zotero/xpcom/translation/item_local.js
@@ -617,12 +617,12 @@ Zotero.Translate.ItemGetter.prototype = {
 	"_attachmentToArray":function(attachment) {
 		var attachmentArray = this._itemToArray(attachment);
 		
-		var linkMode = attachment.getAttachmentLinkMode();
+		var linkMode = attachment.attachmentLinkMode;
 		
 		// get mime type
-		attachmentArray.mimeType = attachmentArray.uniqueFields.mimeType = attachment.getAttachmentMIMEType();
+		attachmentArray.mimeType = attachmentArray.uniqueFields.mimeType = attachment.attachmentMIMEType;
 		// get charset
-		attachmentArray.charset = attachmentArray.uniqueFields.charset = attachment.getAttachmentCharset();
+		attachmentArray.charset = attachmentArray.uniqueFields.charset = attachment.attachmentCharset;
 		
 		if(linkMode != Zotero.Attachments.LINK_MODE_LINKED_URL && this._exportFileDirectory) {
 			// add path and filename if not an internet link
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -3062,7 +3062,7 @@ var ZoteroPane = new function()
 			if(forceExternalViewer !== undefined) {
 				var externalViewer = forceExternalViewer;
 			} else {
-				var mimeType = attachment.getAttachmentMIMEType();
+				var mimeType = attachment.attachmentMIMEType;
 				// If no MIME type specified, try to detect again (I guess in case
 				// we've gotten smarter since the file was imported?)
 				if (!mimeType) {
@@ -3075,7 +3075,6 @@ var ZoteroPane = new function()
 				var externalViewer = Zotero.isStandalone || (!Zotero.MIME.hasNativeHandler(mimeType, ext) &&
 					(!Zotero.MIME.hasInternalHandler(mimeType, ext) || Zotero.Prefs.get('launchNonNativeFiles')));
 			}
-			
 			if (!externalViewer) {
 				var url = 'zotero://attachment/' + itemID + '/';
 				this.loadURI(url, event, { attachmentID: itemID});