mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 05:19:39 +00:00
sandbox - configure nativeWindowOpen:true
This matches the behaviour of sandboxed Electron renderers.
This commit is contained in:
parent
0840d6b9b8
commit
7f49ef52e3
|
@ -10,7 +10,7 @@ const path = require('path');
|
||||||
let window = null;
|
let window = null;
|
||||||
|
|
||||||
app.once('ready', () => {
|
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.setMenuBarVisibility(false);
|
||||||
window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
|
window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
|
||||||
// window.webContents.openDevTools();
|
// window.webContents.openDevTools();
|
||||||
|
|
|
@ -60,7 +60,8 @@ export class ProxyAuthHandler extends Disposable {
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webviewTag: true,
|
webviewTag: true,
|
||||||
enableWebSQL: false
|
enableWebSQL: false,
|
||||||
|
nativeWindowOpen: true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@ export class SharedProcess implements ISharedProcess {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webgl: false,
|
webgl: false,
|
||||||
enableWebSQL: false,
|
enableWebSQL: false,
|
||||||
|
nativeWindowOpen: true,
|
||||||
disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
|
disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -170,7 +170,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
|
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
|
||||||
webviewTag: true,
|
webviewTag: true,
|
||||||
enableWebSQL: false
|
enableWebSQL: false,
|
||||||
|
nativeWindowOpen: true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -196,7 +196,8 @@ export class IssueMainService implements ICommonIssueService {
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
enableWebSQL: false
|
enableWebSQL: false,
|
||||||
|
nativeWindowOpen: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -247,7 +248,8 @@ export class IssueMainService implements ICommonIssueService {
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
enableWebSQL: false
|
enableWebSQL: false,
|
||||||
|
nativeWindowOpen: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -117,7 +117,8 @@ app.on('ready', () => {
|
||||||
webSecurity: false,
|
webSecurity: false,
|
||||||
webviewTag: true,
|
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
|
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
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue