scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use mergeWith in requestAddMonitor, requestUpdateMonitor

Browse source 
So undefined values don't overwrite defined ones
This commit is contained in:
Connor Hudson 2018-06-06 15:54:12 -04:00
parent c2645f3da5
commit 18640d7ddc
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/engine/runtime.js
View file

@ -1522,7 +1522,17 @@ class Runtime extends EventEmitter {
* @param {!MonitorRecord} monitor Monitor to add.
*/
requestAddMonitor (monitor) {
this._monitorState = this._monitorState.set(monitor.get('id'), monitor);
const id = monitor.get('id');
if (this._monitorState.has(id)) {
this._monitorState = this._monitorState.set(id, this._monitorState.get(id).mergeWith((prev, next) => {
if (!next) {
return prev;
}
return next;
}, monitor));
} else {
this._monitorState = this._monitorState.set(id, monitor);
}
}
/**
@ -1536,7 +1546,12 @@ class Runtime extends EventEmitter {
const id = monitor.get('id');
if (this._monitorState.has(id)) {
this._monitorState =
this._monitorState.set(id, this._monitorState.get(id).merge(monitor));
this._monitorState.set(id, this._monitorState.get(id).mergeWith((prev, next) => {
if (!next) {
return prev;
}
return next;
}, monitor));
}
}