From bcb35743f0e0ec773127244f3655f03548b033eb Mon Sep 17 00:00:00 2001
From: Moritz Langenstein <ml5717@ic.ac.uk>
Date: Fri, 29 Nov 2019 01:42:41 +0000
Subject: [PATCH] (ml5717) Union struct first merge sync fix
---
src/y-union.js | 2 +-
src/yjs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/y-union.js b/src/y-union.js
index aabe816..fedc75d 100644
--- a/src/y-union.js
+++ b/src/y-union.js
@@ -139,7 +139,7 @@ export default function extendYUnion(Y) {
initType: function* YUnionInitializer(os, model) {
const union = model.union
const contents =
- union !== null ? yield* this.getOperation(union).content[0] : "[]"
+ union !== null ? (yield* this.getOperation(union)).content[0] : "[]"
return new YUnion(os, model, contents)
},
createType: function YUnionCreator(os, model) {
diff --git a/src/yjs b/src/yjs
index c2a0780..44aa194 160000
--- a/src/yjs
+++ b/src/yjs
@@ -1 +1 @@
-Subproject commit c2a07807dfaa1e5e6b667d83aa4a7d348c759c0f
+Subproject commit 44aa194d19217cbc1d8e0828cf8fdf39fc4dcdd3
--
GitLab