Skip to content

Commit 7b2517c

Browse files
committed
web - fix cancel id of warning dialog for local file access
1 parent f9c154a commit 7b2517c

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/vs/workbench/browser/labels.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export const DEFAULT_LABELS_CONTAINER: IResourceLabelsContainer = {
102102

103103
export class ResourceLabels extends Disposable {
104104

105-
private _onDidChangeDecorations = this._register(new Emitter<void>());
105+
private readonly _onDidChangeDecorations = this._register(new Emitter<void>());
106106
readonly onDidChangeDecorations = this._onDidChangeDecorations.event;
107107

108108
private widgets: ResourceLabelWidget[] = [];

src/vs/workbench/browser/parts/editor/tabsTitleControl.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,14 +1150,14 @@ export class TabsTitleControl extends TitleControl {
11501150
description = tabLabel.description || '';
11511151
}
11521152

1153-
const title = tabLabel.title || '';
1154-
11551153
if (tabLabel.ariaLabel) {
11561154
tabContainer.setAttribute('aria-label', tabLabel.ariaLabel);
11571155
// Set aria-description to empty string so that screen readers would not read the title as well
11581156
// More details https://github.com/microsoft/vscode/issues/95378
11591157
tabContainer.setAttribute('aria-description', '');
11601158
}
1159+
1160+
const title = tabLabel.title || '';
11611161
tabContainer.title = title;
11621162

11631163
// Label
@@ -1186,7 +1186,6 @@ export class TabsTitleControl extends TitleControl {
11861186

11871187
private redrawTabActiveAndDirty(isGroupActive: boolean, editor: IEditorInput, tabContainer: HTMLElement, tabActionBar: ActionBar): void {
11881188
const isTabActive = this.group.isActive(editor);
1189-
11901189
const hasModifiedBorderTop = this.doRedrawTabDirty(isGroupActive, isTabActive, editor, tabContainer);
11911190

11921191
this.doRedrawTabActive(isGroupActive, !hasModifiedBorderTop, editor, tabContainer, tabActionBar);

src/vs/workbench/services/dialogs/browser/fileDialogService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export class FileDialogService extends AbstractFileDialogService implements IFil
191191
[localize('openRemote', "Open Remote..."), localize('learnMore', "Learn More"), localize('cancel', "Cancel")],
192192
{
193193
detail: localize('unsupportedBrowserDetail', "Click 'Learn More' to see a list of supported browsers."),
194-
cancelId: 1
194+
cancelId: 2
195195
}
196196
);
197197

0 commit comments

Comments
 (0)