www

commit d67c6542451cf6db3dbc200a417002841d924ccf
parent 3390f2405b6cce49c1fde2e08ad94e5f9a343f53
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 26 Jan 2018 03:33:01 -0500

Add `version` option to `toResponseJSON()`

Diffstat:
M
chrome/content/zotero/xpcom/data/dataObject.js
 | 
6
+++++-
M
test/tests/syncEngineTest.js
 | 
6
+++---

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/dataObject.js b/chrome/content/zotero/xpcom/data/dataObject.js
@@ -1252,12 +1252,16 @@ Zotero.DataObject.prototype._finalizeErase = Zotero.Promise.coroutine(function* 
 Zotero.DataObject.prototype.toResponseJSON = function (options) {
 	// TODO: library block?
 	
-	return {
+	var json = {
 		key: this.key,
 		version: this.version,
 		meta: {},
 		data: this.toJSON(options)
 	};
+	if (options.version) {
+		json.version = json.data.version = options.version;
+	}
+	return json;
 }
 
 
diff --git a/test/tests/syncEngineTest.js b/test/tests/syncEngineTest.js
@@ -782,9 +782,9 @@ describe("Zotero.Sync.Data.Engine", function () {
 						},
 						JSON.stringify({
 							successful: {
-								"0": item2.toResponseJSON(),
-								"1": item1.toResponseJSON(),
-								"2": item3.toResponseJSON()
+								"0": item2.toResponseJSON({ version: lastLibraryVersion }),
+								"1": item1.toResponseJSON({ version: lastLibraryVersion }),
+								"2": item3.toResponseJSON({ version: lastLibraryVersion })
 							},
 							unchanged: {},
 							failed: {}