From ce16a28f4aa3cae4749e40c06934b752baf1b983 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 9 Apr 2023 16:58:51 -0400
Subject: [PATCH] Set a default annotation color if not assigned

https://forums.zotero.org/discussion/104249/sync-issue-on-ipados
---
 chrome/content/zotero/xpcom/annotations.js | 2 ++
 chrome/content/zotero/xpcom/data/item.js   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js
index db83e4a028..5799fb70c4 100644
--- a/chrome/content/zotero/xpcom/annotations.js
+++ b/chrome/content/zotero/xpcom/annotations.js
@@ -33,6 +33,8 @@ Zotero.Annotations = new function () {
 	Zotero.defineProperty(this, 'ANNOTATION_TYPE_IMAGE', { value: 3 });
 	Zotero.defineProperty(this, 'ANNOTATION_TYPE_INK', { value: 4 });
 	
+	Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: 'ffd400' });
+	
 	Zotero.defineProperty(this, 'PROPS', {
 		value: ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', 'sortIndex', 'position'],
 		writable: false
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 3c64543a40..780d9773a2 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -1935,7 +1935,7 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
 				authorName || null,
 				text || null,
 				comment || null,
-				color || null,
+				color || Zotero.Annotations.DEFAULT_COLOR,
 				pageLabel || null,
 				sortIndex,
 				position,