Skip to content

Commit ba4530b

Browse files
committed
refactor: simplify code
1 parent 89d8233 commit ba4530b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,17 +297,17 @@ export default class Emittery {
297297

298298
const off = () => {
299299
this.off(eventNames, listener);
300-
options?.signal?.removeEventListener('abort', off);
300+
signal?.removeEventListener('abort', off);
301301
};
302302

303-
options?.signal?.addEventListener('abort', off, {once: true});
303+
signal?.addEventListener('abort', off, {once: true});
304304

305-
if (options?.signal?.aborted) {
305+
if (signal?.aborted) {
306306
off();
307307
}
308308

309309
return off;
310-
}
310+
}o
311311

312312
off(eventNames, listener) {
313313
assertListener(listener);
@@ -416,7 +416,7 @@ export default class Emittery {
416416
/* eslint-enable no-await-in-loop */
417417
}
418418

419-
onAny(listener, options) {
419+
onAny(listener, {signal} = {}) {
420420
assertListener(listener);
421421

422422
this.logIfDebugEnabled('subscribeAny', undefined, undefined);
@@ -426,12 +426,12 @@ export default class Emittery {
426426

427427
const offAny = () => {
428428
this.offAny(listener);
429-
options?.signal?.removeEventListener('abort', offAny);
429+
signal?.removeEventListener('abort', offAny);
430430
};
431431

432-
options?.signal?.addEventListener('abort', offAny);
432+
signal?.addEventListener('abort', offAny);
433433

434-
if (options?.signal?.aborted) {
434+
if (signal?.aborted) {
435435
offAny();
436436
}
437437

0 commit comments

Comments
 (0)