Skip to content

Commit cb40221

Browse files
committed
merging from upstream broke a couple of things :|
1 parent 64d6052 commit cb40221

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/addons/addons/collaboration/userscript.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,15 +515,18 @@ function attachYjsProvider() {
515515
if (constants.mutableRefs.isWorkspaceLoading) return;
516516

517517
constants.mutableRefs.ydoc.transact(() => {
518-
monitorList.forEach((monitor, id) => {
518+
const monitors = (monitorList && monitorList.map instanceof Map) ? monitorList.map : monitorList;
519+
520+
monitors.forEach((monitor, id) => {
519521
const existingYMonitor = constants.mutableRefs.sharedMonitors.get(id);
522+
const monitorData = monitor.toJS ? monitor.toJS() : monitor;
520523

521524
if (!existingYMonitor) {
522525
const yMonitor = helper.serializeMonitorForYjs(monitor);
523526
constants.mutableRefs.sharedMonitors.set(id, yMonitor);
524527
} else {
525528
const existingMonitor = helper.deserializeMonitorFromYjs(existingYMonitor);
526-
if (!helper.compareMonitorData(existingMonitor, monitor.toJS())) {
529+
if (!helper.compareMonitorData(existingMonitor, monitorData)) {
527530
const yMonitor = helper.serializeMonitorForYjs(monitor);
528531
constants.mutableRefs.sharedMonitors.set(id, yMonitor);
529532
}

0 commit comments

Comments
 (0)