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

Additional comments and cleanup for target selector handler

Browse source
This commit is contained in:
Dan Stillman 2018-03-29 07:27:06 -04:00
parent 9b9773db16
commit c5cd38b4a5
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chrome/content/zotero/xpcom/server_connector.js
View file

@ -81,7 +81,7 @@ Zotero.Server.Connector.SessionManager = {
}, },
create: function (id) { create: function (id) {
// Legacy client // Legacy connector
if (!id) { if (!id) {
Zotero.debug("No session id provided by client", 2); Zotero.debug("No session id provided by client", 2);
id = Zotero.Utilities.randomString(); id = Zotero.Utilities.randomString();
@ -124,6 +124,9 @@ Zotero.Server.Connector.SaveSession.prototype.addItems = async function (items)
return this._addObjects('item', items); return this._addObjects('item', items);
}; };
/**
* Change the target data for this session and update any items that have already been saved
*/
Zotero.Server.Connector.SaveSession.prototype.update = async function (libraryID, collectionID, tags) { Zotero.Server.Connector.SaveSession.prototype.update = async function (libraryID, collectionID, tags) {
this._currentLibraryID = libraryID; this._currentLibraryID = libraryID;
this._currentCollectionID = collectionID; this._currentCollectionID = collectionID;
@ -161,20 +164,22 @@ Zotero.Server.Connector.SaveSession.prototype.update = async function (libraryID
}; };
Zotero.Server.Connector.SaveSession.prototype._addObjects = async function (objectType, objects) { Zotero.Server.Connector.SaveSession.prototype._addObjects = async function (objectType, objects) {
if (!this._objects[objectType]) { // Update the objects with the current target data, in case it changed since the save began
this._objects[objectType] = new Set();
}
// If target has changed since the save began, update the objects
await this._updateObjects({ await this._updateObjects({
[objectType]: objects [objectType]: objects
}); });
if (!this._objects[objectType]) {
this._objects[objectType] = new Set();
}
for (let object of objects) { for (let object of objects) {
this._objects[objectType].add(object); this._objects[objectType].add(object);
} }
}; };
/**
* Update the passed objects with the current target and tags
*/
Zotero.Server.Connector.SaveSession.prototype._updateObjects = async function (objects) { Zotero.Server.Connector.SaveSession.prototype._updateObjects = async function (objects) {
if (Object.keys(objects).every(type => objects[type].length == 0)) { if (Object.keys(objects).every(type => objects[type].length == 0)) {
return; return;
@ -190,8 +195,6 @@ Zotero.Server.Connector.SaveSession.prototype._updateObjects = async function (o
return Zotero.DB.executeTransaction(async function () { return Zotero.DB.executeTransaction(async function () {
for (let objectType in objects) { for (let objectType in objects) {
for (let object of objects[objectType]) { for (let object of objects[objectType]) {
Zotero.debug(object.libraryID);
Zotero.debug(libraryID);
if (object.libraryID != libraryID) { if (object.libraryID != libraryID) {
throw new Error("Can't move objects between libraries"); throw new Error("Can't move objects between libraries");
} }