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

Fix item.clone() on annotation items

Browse source
This commit is contained in:
Dan Stillman 2021-03-21 14:35:57 -04:00
parent 9eb4fdb9cd
commit 7889cd5d39
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/xpcom/annotations.js
View file

@ -31,6 +31,11 @@ Zotero.Annotations = new function () {
Zotero.defineProperty(this, 'ANNOTATION_TYPE_NOTE', { value: 2 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_NOTE', { value: 2 });
Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 }); Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 });
Zotero.defineProperty(this, 'PROPS', {
value: ['type', 'text', 'comment', 'color', 'sortIndex', 'position'],
writable: false
});
this.getCacheImagePath = function ({ libraryID, key }) { this.getCacheImagePath = function ({ libraryID, key }) {
var file = this._getLibraryCacheDirectory(libraryID); var file = this._getLibraryCacheDirectory(libraryID);

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

@ -4481,7 +4481,7 @@ Zotero.Item.prototype.clone = function (libraryID, options = {}) {
if (this.isRegularItem()) { if (this.isRegularItem()) {
newItem.setCreators(this.getCreators()); newItem.setCreators(this.getCreators());
} }
else { else if (this.isNote() || this.isAttachment()) {
newItem.setNote(this.getNote()); newItem.setNote(this.getNote());
if (sameLibrary) { if (sameLibrary) {
var parent = this.parentKey; var parent = this.parentKey;
@ -4501,6 +4501,13 @@ Zotero.Item.prototype.clone = function (libraryID, options = {}) {
} }
} }
} }
else if (this.isAnnotation()) {
let props = Zotero.Annotations.PROPS;
for (let prop of props) {
let fullProp = 'annotation' + Zotero.Utilities.capitalize(prop);
newItem[fullProp] = this[fullProp];
}
}
if (!options.skipTags) { if (!options.skipTags) {
newItem.setTags(this.getTags()); newItem.setTags(this.getTags());

13
test/tests/itemTest.js
View file

@ -1729,6 +1729,19 @@ describe("Zotero.Item", function () {
var newItem = item.clone(); var newItem = item.clone();
assert.isEmpty(Object.keys(newItem.toJSON().relations)); assert.isEmpty(Object.keys(newItem.toJSON().relations));
}); });
it("should clone an annotation item", async function () {
var attachment = await importFileAttachment('test.pdf');
var annotation = await createAnnotation('highlight', attachment);
var newAnnotation = annotation.clone();
var fields = Object.keys(annotation.toJSON())
.filter(field => field.startsWith('annotation'));
assert.isAbove(fields.length, 0);
for (let field of fields) {
assert.equal(annotation[field], newAnnotation[field]);
}
});
}) })
describe("#moveToLibrary()", function () { describe("#moveToLibrary()", function () {