diff --git a/build/builtin/main.js b/build/builtin/main.js index 93cef8cbdad0b2cb3cf9594973262da4394ef4ee..7379de7a93d2e234bbc7357bfe7ffebe386e4173 100644 --- a/build/builtin/main.js +++ b/build/builtin/main.js @@ -10,7 +10,7 @@ const path = require('path'); let window = null; app.once('ready', () => { - window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false } }); + window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false, nativeWindowOpen: true } }); window.setMenuBarVisibility(false); window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true })); // window.webContents.openDevTools(); diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts index 83597f68e02b3a4c8e0511543dc8191325e9c89b..b32f73c9a2fcfc4e63d4e389207ce458731c7b7a 100644 --- a/src/vs/code/electron-main/auth.ts +++ b/src/vs/code/electron-main/auth.ts @@ -60,7 +60,8 @@ export class ProxyAuthHandler extends Disposable { webPreferences: { nodeIntegration: true, webviewTag: true, - enableWebSQL: false + enableWebSQL: false, + nativeWindowOpen: true } }; diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts index 7ace2583d7548109729335082109e2ef8c0eb0a7..b6e38cc42387f097e5a6753728e9b9583a8786cb 100644 --- a/src/vs/code/electron-main/sharedProcess.ts +++ b/src/vs/code/electron-main/sharedProcess.ts @@ -47,6 +47,7 @@ export class SharedProcess implements ISharedProcess { nodeIntegration: true, webgl: false, enableWebSQL: false, + nativeWindowOpen: true, disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer } }); diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index a98bf7a6703db2255d3150244222ad08b2e9d021..59d1370d18a1b1278a69160fdbfe3a87f4f8e070 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -170,7 +170,8 @@ export class CodeWindow extends Disposable implements ICodeWindow { nodeIntegration: true, nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER, webviewTag: true, - enableWebSQL: false + enableWebSQL: false, + nativeWindowOpen: true } }; diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts index 561fb1ad169885d4f43f0191129fe38a04975f29..2d0030b498f148daa8f9a61e407decf319b98426 100644 --- a/src/vs/platform/issue/electron-main/issueMainService.ts +++ b/src/vs/platform/issue/electron-main/issueMainService.ts @@ -196,7 +196,8 @@ export class IssueMainService implements ICommonIssueService { webPreferences: { preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath, nodeIntegration: true, - enableWebSQL: false + enableWebSQL: false, + nativeWindowOpen: true } }); @@ -247,7 +248,8 @@ export class IssueMainService implements ICommonIssueService { webPreferences: { preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath, nodeIntegration: true, - enableWebSQL: false + enableWebSQL: false, + nativeWindowOpen: true } }); diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js index 1911ffc17723c14f57f7a9b8972136c18412ce91..c96cd1ee5a4a9028e4e89b50d7b1fdcde2da78da 100644 --- a/test/unit/electron/index.js +++ b/test/unit/electron/index.js @@ -117,7 +117,8 @@ app.on('ready', () => { webSecurity: false, webviewTag: true, preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-browser', 'preload.js'), // ensure similar environment as VSCode as tests may depend on this - enableWebSQL: false + enableWebSQL: false, + nativeWindowOpen: true } });