maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refs #121089

Browse source
This commit is contained in:
SteVen Batten 2021-08-10 18:21:49 +00:00 committed by GitHub
parent da7d76d2ec
commit 4e79bb935f
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.css
View file

@ -175,6 +175,10 @@
overflow: hidden;
}
.workspace-trust-editor .workspace-trust-settings .trusted-uris-button-bar {
margin-top: 5px;
}
.workspace-trust-editor .workspace-trust-features .workspace-trust-buttons-row .workspace-trust-buttons .monaco-button,
.workspace-trust-editor .workspace-trust-settings .trusted-uris-button-bar .monaco-button {
width: fit-content;
@ -230,6 +234,10 @@
font-weight: 600;
}
.workspace-trust-editor .empty > .trusted-uris-table {
display: none;
}
.workspace-trust-editor .monaco-table-tr .monaco-table-td .path:not(.input-mode) .monaco-inputbox,
.workspace-trust-editor .monaco-table-tr .monaco-table-td .path.input-mode .path-label {
display: none;

15
src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.ts
View file

@ -79,8 +79,10 @@ class WorkspaceTrustedUrisTable extends Disposable {
private readonly table: WorkbenchTable<ITrustedUriItem>;
private readonly descriptionElement: HTMLElement;
constructor(
container: HTMLElement,
private readonly container: HTMLElement,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IWorkspaceContextService private readonly workspaceService: IWorkspaceContextService,
@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
@ -91,6 +93,7 @@ class WorkspaceTrustedUrisTable extends Disposable {
) {
super();
this.descriptionElement = container.appendChild($('.workspace-trusted-folders-description'));
const tableElement = container.appendChild($('.trusted-uris-table'));
const addButtonBarElement = container.appendChild($('.trusted-uris-button-bar'));
@ -265,6 +268,13 @@ class WorkspaceTrustedUrisTable extends Disposable {
}
updateTable(): void {
const entries = this.trustedUriEntries;
this.container.classList.toggle('empty', entries.length === 0);
this.descriptionElement.innerText = entries.length ?
localize('trustedFoldersDescription', "You trust the following folders, their subfolders, and workspace files.") :
localize('noTrustedFoldersDescriptions', "You haven't trusted any folders or workspace files yet.");
this.table.splice(0, Number.POSITIVE_INFINITY, this.trustedUriEntries);
this.layout();
}
@ -818,9 +828,6 @@ export class WorkspaceTrustEditor extends EditorPane {
const configurationTitle = append(this.configurationContainer, $('.workspace-trusted-folders-title'));
configurationTitle.innerText = localize('trustedFoldersAndWorkspaces', "Trusted Folders & Workspaces");
const configurationDescription = append(this.configurationContainer, $('.workspace-trusted-folders-description'));
configurationDescription.innerText = localize('trustedFoldersDescription', "You trust the following folders, their subfolders, and workspace files.");
this.workspaceTrustedUrisTable = this._register(this.instantiationService.createInstance(WorkspaceTrustedUrisTable, this.configurationContainer));
}