Skip to content

Commit fbce947

Browse files
committed
just use object.is
1 parent a4a6837 commit fbce947

1 file changed

Lines changed: 15 additions & 34 deletions

File tree

src/engine/monitor-record.js

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
/**
2-
* Check equality in the following way:
3-
* - NaN is considered equal to NaN
4-
* - 0 is considered not equal to -0
5-
* - Otherwise, uses ===
6-
* @param {unknown} a
7-
* @param {unknown} b
8-
* @returns {boolean} true if a is considered equal to b
9-
*/
10-
const equal = (a, b) => {
11-
if (a === b) {
12-
if (a === 0) {
13-
return Object.is(a, b);
14-
}
15-
return true;
16-
}
17-
return Number.isNaN(a) && Number.isNaN(b);
18-
};
19-
201
/**
212
* @param {unknown} obj
223
* @returns {boolean}
@@ -123,77 +104,77 @@ class MonitorRecord {
123104
merge (delta) {
124105
let didChange = false;
125106

126-
if (defined(delta.id) && !equal(this.id, delta.id)) {
107+
if (defined(delta.id) && !Object.is(this.id, delta.id)) {
127108
this.id = delta.id;
128109
didChange = true;
129110
}
130111

131-
if (defined(delta.spriteName) && !equal(this.spriteName, delta.spriteName)) {
112+
if (defined(delta.spriteName) && !Object.is(this.spriteName, delta.spriteName)) {
132113
this.spriteName = delta.spriteName;
133114
didChange = true;
134115
}
135116

136-
if (defined(delta.targetId) && !equal(this.targetId, delta.targetId)) {
117+
if (defined(delta.targetId) && !Object.is(this.targetId, delta.targetId)) {
137118
this.targetId = delta.targetId;
138119
didChange = true;
139120
}
140121

141-
if (defined(delta.opcode) && !equal(this.opcode, delta.opcode)) {
122+
if (defined(delta.opcode) && !Object.is(this.opcode, delta.opcode)) {
142123
this.opcode = delta.opcode;
143124
didChange = true;
144125
}
145126

146-
if (defined(delta.value) && !equal(this.value, delta.value)) {
127+
if (defined(delta.value) && !Object.is(this.value, delta.value)) {
147128
this.value = delta.value;
148129
didChange = true;
149130
}
150131

151-
if (defined(delta.params) && !equal(this.params, delta.params)) {
132+
if (defined(delta.params) && !Object.is(this.params, delta.params)) {
152133
this.params = delta.params;
153134
didChange = true;
154135
}
155136

156-
if (defined(delta.mode) && !equal(this.mode, delta.mode)) {
137+
if (defined(delta.mode) && !Object.is(this.mode, delta.mode)) {
157138
this.mode = delta.mode;
158139
didChange = true;
159140
}
160141

161-
if (defined(delta.sliderMin) && !equal(this.sliderMin, delta.sliderMin)) {
142+
if (defined(delta.sliderMin) && !Object.is(this.sliderMin, delta.sliderMin)) {
162143
this.sliderMin = delta.sliderMin;
163144
didChange = true;
164145
}
165146

166-
if (defined(delta.sliderMax) && !equal(this.sliderMax, delta.sliderMax)) {
147+
if (defined(delta.sliderMax) && !Object.is(this.sliderMax, delta.sliderMax)) {
167148
this.sliderMax = delta.sliderMax;
168149
didChange = true;
169150
}
170151

171-
if (defined(delta.isDiscrete) && !equal(this.isDiscrete, delta.isDiscrete)) {
152+
if (defined(delta.isDiscrete) && !Object.is(this.isDiscrete, delta.isDiscrete)) {
172153
this.isDiscrete = delta.isDiscrete;
173154
didChange = true;
174155
}
175156

176-
if (defined(delta.x) && !equal(this.x, delta.x)) {
157+
if (defined(delta.x) && !Object.is(this.x, delta.x)) {
177158
this.x = delta.x;
178159
didChange = true;
179160
}
180161

181-
if (defined(delta.y) && !equal(this.y, delta.y)) {
162+
if (defined(delta.y) && !Object.is(this.y, delta.y)) {
182163
this.y = delta.y;
183164
didChange = true;
184165
}
185166

186-
if (defined(delta.width) && !equal(this.width, delta.width)) {
167+
if (defined(delta.width) && !Object.is(this.width, delta.width)) {
187168
this.width = delta.width;
188169
didChange = true;
189170
}
190171

191-
if (defined(delta.height) && !equal(this.height, delta.height)) {
172+
if (defined(delta.height) && !Object.is(this.height, delta.height)) {
192173
this.height = delta.height;
193174
didChange = true;
194175
}
195176

196-
if (defined(delta.visible) && !equal(this.visible, delta.visible)) {
177+
if (defined(delta.visible) && !Object.is(this.visible, delta.visible)) {
197178
this.visible = delta.visible;
198179
didChange = true;
199180
}

0 commit comments

Comments
 (0)