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

Fix some deprecated calls

Browse source
This commit is contained in:
Dan Stillman 2011-02-13 18:46:34 +00:00
parent 0432da1d25
commit eb5711c87c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/translation/item_local.js
View file

@ -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

3
chrome/content/zotero/zoteroPane.js
View file

@ -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});