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

API change: item.attachmentCharset now returns charset name, not ID

Browse source 
Since apparently half of our own code didn't know that it returned an
ID...

The item.attachmentCharset setter can still take either name or ID.
This commit is contained in:
Dan Stillman 2014-02-01 03:16:21 -05:00
parent 07b8d56401
commit fadd486dc1
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
chrome/content/zotero/xpcom/data/item.js
View file

@ -1527,7 +1527,7 @@ Zotero.Item.prototype.save = function(options) {
var parent = this.getSource();
var linkMode = this.attachmentLinkMode;
var mimeType = this.attachmentMIMEType;
var charsetID = this.attachmentCharset;
var charsetID = Zotero.CharacterSets.getID(this.attachmentCharset);
var path = this.attachmentPath;
var syncState = this.attachmentSyncState;
@ -1944,7 +1944,7 @@ Zotero.Item.prototype.save = function(options) {
let parent = this.getSource();
var linkMode = this.attachmentLinkMode;
var mimeType = this.attachmentMIMEType;
var charsetID = this.attachmentCharset;
var charsetID = Zotero.CharacterSets.getID(this.attachmentCharset);
var path = this.attachmentPath;
var syncState = this.attachmentSyncState;
@ -3242,7 +3242,7 @@ Zotero.Item.prototype.__defineGetter__('attachmentCharset', function () {
}
if (this._attachmentCharset != undefined) {
return this._attachmentCharset;
return Zotero.CharacterSets.getName(this._attachmentCharset);
}
if (!this.id) {
@ -3255,7 +3255,7 @@ Zotero.Item.prototype.__defineGetter__('attachmentCharset', function () {
charset = null;
}
this._attachmentCharset = charset;
return charset;
return Zotero.CharacterSets.getName(charset);
});
@ -4850,8 +4850,7 @@ Zotero.Item.prototype.serialize = function(mode) {
arr.attachment = {};
arr.attachment.linkMode = this.attachmentLinkMode;
arr.attachment.mimeType = this.attachmentMIMEType;
var charsetID = this.attachmentCharset;
arr.attachment.charset = Zotero.CharacterSets.getName(charsetID);
arr.attachment.charset = this.attachmentCharset;
arr.attachment.path = this.attachmentPath;
}