Skip to content

Commit 6cd7574

Browse files
felixriesebergJohn Kleinschmidt
felixrieseberg
authored and
John Kleinschmidt
committed
refactor: Port window-setup to TS (electron#16894)
* refactor: Port window-setup to TS * refactor: Make the linter happy * refactor: Sneaky little TS error * refactor: Correctly import window-setup * refactor: Implement feedback <3 * refactor: Allow decorators in TS * refactor: Use named windowSetup in isolatedRenderer * refactor: Help TS understand * refactor: Welp, use createEvent again * refactor: Use the correct target in the decorator
1 parent 2492f0b commit 6cd7574

File tree

6 files changed

+282
-243
lines changed

6 files changed

+282
-243
lines changed

‎filenames.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ filenames = {
7272
"lib/renderer/remote.js",
7373
"lib/renderer/security-warnings.js",
7474
"lib/renderer/web-frame-init.js",
75-
"lib/renderer/window-setup.js",
75+
"lib/renderer/window-setup.ts",
7676
"lib/renderer/web-view/guest-view-internal.js",
7777
"lib/renderer/web-view/web-view-attributes.js",
7878
"lib/renderer/web-view/web-view-constants.js",

‎lib/isolated_renderer/init.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ const isolatedWorldArgs = v8Util.getHiddenValue(isolatedWorld, 'isolated-world-a
1818

1919
if (isolatedWorldArgs) {
2020
const { ipcRenderer, guestInstanceId, isHiddenPage, openerId, usesNativeWindowOpen } = isolatedWorldArgs
21-
require('@electron/internal/renderer/window-setup')(ipcRenderer, guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen)
21+
const { windowSetup } = require('@electron/internal/renderer/window-setup')
22+
windowSetup(ipcRenderer, guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen)
2223
}

‎lib/renderer/init.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ switch (window.location.protocol) {
7373
break
7474
default: {
7575
// Override default web functions.
76-
require('@electron/internal/renderer/window-setup')(ipcRenderer, guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen)
76+
const { windowSetup } = require('@electron/internal/renderer/window-setup')
77+
windowSetup(ipcRenderer, guestInstanceId, openerId, isHiddenPage, usesNativeWindowOpen)
7778

7879
// Inject content scripts.
7980
if (process.isMainFrame) {

‎lib/renderer/window-setup.js‎

Lines changed: 0 additions & 239 deletions
This file was deleted.

0 commit comments

Comments
 (0)