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

Cleanup markdown security setting selector UX

Browse Source
This commit is contained in:
Matt Bierner
2017-08-02 15:00:13 -07:00
parent b92584a4dd
commit f1d39bb3ea
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/markdown/src/security.ts
View File

@@ -86,36 +86,25 @@ export class PreviewSecuritySelector {
) { }
public async showSecutitySelectorForResource(resource: vscode.Uri): Promise<void> {
function markActiveWhen(when: boolean): string {
return when ? '• ' : '';
}
const currentSecurityLevel = this.cspArbiter.getSecurityLevelForResource(resource);
const selection = await vscode.window.showQuickPick<PreviewSecurityPickItem>(
[
{
level: MarkdownPreviewSecurityLevel.Strict,
label: localize(
'preview.showPreviewSecuritySelector.strictTitle',
'Strict. Only load secure content'),
description: '',
detail: currentSecurityLevel === MarkdownPreviewSecurityLevel.Strict
? localize('preview.showPreviewSecuritySelector.currentSelection', 'Current setting')
: ''
label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.Strict) + localize('strict.title', 'Strict'),
description: localize('strict.description', 'Only load secure content'),
}, {
level: MarkdownPreviewSecurityLevel.AllowInsecureContent,
label: localize(
'preview.showPreviewSecuritySelector.insecureContentTitle',
'Allow loading content over http'),
description: '',
detail: currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowInsecureContent
? localize('preview.showPreviewSecuritySelector.currentSelection', 'Current setting')
: ''
label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowInsecureContent) + localize('insecureContent.title', 'Allow insecure content'),
description: localize('insecureContent.description', 'Enable loading content over http'),
}, {
level: MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent,
label: localize(
'preview.showPreviewSecuritySelector.scriptsAndAllContent',
'Allow all content and script execution. Not recommended'),
description: '',
detail: currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent
? localize('preview.showPreviewSecuritySelector.currentSelection', 'Current setting')
: ''
label: markActiveWhen(currentSecurityLevel === MarkdownPreviewSecurityLevel.AllowScriptsAndAllContent) + localize('disable.title', 'Disable'),
description: localize('disable.description', 'Allow all content and script execution. Not recommended'),
},
], {
placeHolder: localize(