diff options
| author | Andreu Botella <abb@randomunok.com> | 2021-10-08 09:53:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 09:53:31 +0200 |
| commit | 74e5b68682d4d2503e4af5bac3b98067bc58f275 (patch) | |
| tree | e6885e8b9c7a32c481bb5c4fe334ac40fcb89563 /runtime/js/99_main.js | |
| parent | 7e38ae17ea5dba600d0bf7bb6f6fafe7cd25befd (diff) | |
refactor: deduplicate `defineEventHandler` util (#12367)
Diffstat (limited to 'runtime/js/99_main.js')
| -rw-r--r-- | runtime/js/99_main.js | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index 4f21655d6..117200a28 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -59,7 +59,7 @@ delete Object.prototype.__proto__; const errors = window.__bootstrap.errors.errors; const webidl = window.__bootstrap.webidl; const domException = window.__bootstrap.domException; - const { defineEventHandler } = window.__bootstrap.webUtil; + const { defineEventHandler } = window.__bootstrap.event; const { deserializeJsMessageData, serializeJsMessageData } = window.__bootstrap.messagePort; @@ -479,10 +479,6 @@ delete Object.prototype.__proto__; enumerable: true, get: () => navigator, }, - // TODO(bartlomieju): from MDN docs (https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope) - // it seems those two properties should be available to workers as well - onload: util.writable(null), - onunload: util.writable(null), close: util.writable(windowClose), closed: util.getterOnly(() => windowIsClosing), alert: util.writable(prompt.alert), @@ -514,8 +510,6 @@ delete Object.prototype.__proto__; get: () => workerNavigator, }, self: util.readOnly(globalThis), - onmessage: util.writable(null), - onerror: util.writable(null), // TODO(bartlomieju): should be readonly? close: util.nonEnumerable(workerClose), postMessage: util.writable(postMessage), @@ -548,8 +542,8 @@ delete Object.prototype.__proto__; eventTarget.setEventTargetData(globalThis); - defineEventHandler(window, "load", null); - defineEventHandler(window, "unload", null); + defineEventHandler(window, "load"); + defineEventHandler(window, "unload"); const isUnloadDispatched = SymbolFor("isUnloadDispatched"); // Stores the flag for checking whether unload is dispatched or not. @@ -646,8 +640,8 @@ delete Object.prototype.__proto__; eventTarget.setEventTargetData(globalThis); - defineEventHandler(self, "message", null); - defineEventHandler(self, "error", null, true); + defineEventHandler(self, "message"); + defineEventHandler(self, "error", undefined, true); runtimeStart( runtimeOptions, |