From 031e29b1cf14f643f3b52c52f77785e71f011708 Mon Sep 17 00:00:00 2001 From: bobzel Date: Tue, 6 Oct 2020 14:29:43 -0400 Subject: from last --- src/client/util/CurrentUserUtils.ts | 2 +- src/fields/util.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index f6ac363da..144c4b804 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -884,7 +884,7 @@ export class CurrentUserUtils { (sharedDocs as Doc)["acl-Public"] = Doc.GetProto(sharedDocs as Doc)["acl-Public"] = SharingPermissions.Add; } if (sharedDocs instanceof Doc) { - sharedDocs.userColor = sharedDocs.userColor || "#12121233"; + sharedDocs.userColor = sharedDocs.userColor || "#121212"; } doc.mySharedDocs = new PrefetchProxy(sharedDocs); } diff --git a/src/fields/util.ts b/src/fields/util.ts index b6128f5e6..6e72675db 100644 --- a/src/fields/util.ts +++ b/src/fields/util.ts @@ -382,8 +382,8 @@ export function updateFunction(target: any, prop: any, value: any, receiver: any if (!(value instanceof CursorField) && !(value?.some?.((v: any) => v instanceof CursorField))) { UndoManager.AddEvent(diff?.op === "$addToSet" ? { - redo: () => receiver[prop].push(...(newValue as List)), - undo: action(() => (newValue as List).forEach(doc => { + redo: () => receiver[prop].push(...diff.items), + undo: action(() => diff.items.forEach((doc: Doc) => { const ind = receiver[prop].indexOf(doc); ind !== -1 && receiver[prop].splice(ind, 1); })) -- cgit v1.2.3-70-g09d2