Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into aeschli/avoidthemeonbody

Browse Source
This commit is contained in:
Martin Aeschlimann
2020-05-12 08:58:55 +02:00
committed by GitHub
parent 8ae60f5a33 9798bdde87
commit 2b9a141306
167 changed files with 4059 additions and 3091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/code/electron-browser/proxy/auth.html
View File

@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8" />
<meta http-equiv="Content-Security-Policy"
content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
content="default-src 'none'; img-src 'self' https: data:; media-src 'none'; child-src 'self'; object-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' https:; font-src 'self' https:;">
<style>
html,
body {

4
src/vs/code/electron-main/app.ts
View File

@@ -125,7 +125,7 @@ export class CodeApplication extends Disposable {
// Mac only event: open new window when we get activated
if (!hasVisibleWindows && this.windowsMainService) {
this.windowsMainService.openEmptyWindow(OpenContext.DOCK);
this.windowsMainService.openEmptyWindow({ context: OpenContext.DOCK });
}
});
@@ -258,7 +258,7 @@ export class CodeApplication extends Disposable {
app.on('new-window-for-tab', () => {
if (this.windowsMainService) {
this.windowsMainService.openEmptyWindow(OpenContext.DESKTOP); //macOS native tab "+" button
this.windowsMainService.openEmptyWindow({ context: OpenContext.DESKTOP }); //macOS native tab "+" button
}
});