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

Merge branch 'master' into ben/sandbox-environment

Browse Source
This commit is contained in:
Benjamin Pasero
2020-09-04 10:45:13 +02:00
parent b2acd8fa72 45c70c29e5
commit 3da939d1d7
26 changed files with 178 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/code/browser/workbench/workbench.ts
View File

@@ -440,7 +440,13 @@ class WindowIndicator implements IWindowIndicator {
// Find credentials from DOM
const credentialsElement = document.getElementById('vscode-workbench-credentials');
const credentialsElementAttribute = credentialsElement ? credentialsElement.getAttribute('data-settings') : undefined;
const credentialsProvider = new LocalStorageCredentialsProvider(credentialsElementAttribute ? JSON.parse(credentialsElementAttribute) : []);
let credentials = undefined;
if (credentialsElementAttribute) {
try {
credentials = JSON.parse(credentialsElementAttribute);
} catch (error) { /* Invalid credentials are passed. Ignore. */ }
}
const credentialsProvider = new LocalStorageCredentialsProvider(credentials || []);
// Finally create workbench
create(document.body, {