From 896fb66917a47b7e90a3c7ec96f2cbd6dd539d06 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 23 Sep 2020 17:59:49 -0500 Subject: [PATCH] Clean up dead aria-label code #106897 --- .../preferences/browser/settingsEditor2.ts | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts index 63113b3427b..030197f55f1 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts @@ -28,7 +28,6 @@ import { ConfigurationTarget, IConfigurationOverrides, IConfigurationService } f import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IEditorModel } from 'vs/platform/editor/common/editor'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ILogService } from 'vs/platform/log/common/log'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; @@ -47,7 +46,7 @@ import { AbstractSettingRenderer, ISettingLinkClickEvent, ISettingOverrideClickE import { ISettingsEditorViewState, parseQuery, SearchResultIdx, SearchResultModel, SettingsTreeElement, SettingsTreeGroupChild, SettingsTreeGroupElement, SettingsTreeModel, SettingsTreeSettingElement } from 'vs/workbench/contrib/preferences/browser/settingsTreeModels'; import { settingsTextInputBorder } from 'vs/workbench/contrib/preferences/browser/settingsWidgets'; import { createTOCIterator, TOCTree, TOCTreeModel } from 'vs/workbench/contrib/preferences/browser/tocTree'; -import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, EXTENSION_SETTING_TAG, IPreferencesSearchService, ISearchProvider, MODIFIED_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU } from 'vs/workbench/contrib/preferences/common/preferences'; +import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, EXTENSION_SETTING_TAG, IPreferencesSearchService, ISearchProvider, MODIFIED_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS } from 'vs/workbench/contrib/preferences/common/preferences'; import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { IPreferencesService, ISearchResult, ISettingsEditorModel, ISettingsEditorOptions, SettingsEditorOptions, SettingValueType } from 'vs/workbench/services/preferences/common/preferences'; import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput'; @@ -120,8 +119,6 @@ export class SettingsEditor2 extends EditorPane { private tocTreeContainer!: HTMLElement; private tocTree!: TOCTree; - private settingsAriaExtraLabelsContainer!: HTMLElement; - private delayedFilterLogging: Delayer; private localSearchDelayer: Delayer; private remoteSearchThrottle: ThrottledDelayer; @@ -165,7 +162,6 @@ export class SettingsEditor2 extends EditorPane { @IStorageService private readonly storageService: IStorageService, @INotificationService private readonly notificationService: INotificationService, @IEditorGroupsService protected editorGroupService: IEditorGroupsService, - @IKeybindingService private readonly keybindingService: IKeybindingService, @IStorageKeysSyncRegistryService storageKeysSyncRegistryService: IStorageKeysSyncRegistryService, @IUserDataSyncWorkbenchService private readonly userDataSyncWorkbenchService: IUserDataSyncWorkbenchService, @IUserDataAutoSyncService private readonly userDataAutoSyncService: IUserDataAutoSyncService @@ -216,12 +212,7 @@ export class SettingsEditor2 extends EditorPane { private set searchResultModel(value: SearchResultModel | null) { this._searchResultModel = value; - DOM.toggleClass(this.rootElement, 'search-mode', !!this._searchResultModel); - } - - private get currentSettingsContextMenuKeyBindingLabel(): string { - const keybinding = this.keybindingService.lookupKeybinding(SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU); - return (keybinding && keybinding.getAriaLabel()) || ''; + this.rootElement.classList.toggle('search-mode', !!this._searchResultModel); } createEditor(parent: HTMLElement): void { @@ -351,16 +342,6 @@ export class SettingsEditor2 extends EditorPane { } focusSettings(focusSettingInput = false): void { - // TODO@roblourens is this in the right place? - // Update ARIA global labels - const labelElement = this.settingsAriaExtraLabelsContainer.querySelector('#settings_aria_more_actions_shortcut_label'); - if (labelElement) { - const settingsContextMenuShortcut = this.currentSettingsContextMenuKeyBindingLabel; - if (settingsContextMenuShortcut) { - labelElement.setAttribute('aria-label', localize('settingsContextMenuAriaShortcut', "For more actions, Press {0}.", settingsContextMenuShortcut)); - } - } - const focused = this.settingsTree.getFocus(); if (!focused.length) { this.settingsTree.focusFirst(); @@ -648,14 +629,6 @@ export class SettingsEditor2 extends EditorPane { private createSettingsTree(parent: HTMLElement): void { this.settingsTreeContainer = DOM.append(parent, $('.settings-tree-container')); - // Add ARIA extra labels div - this.settingsAriaExtraLabelsContainer = DOM.append(this.settingsTreeContainer, $('.settings-aria-extra-labels')); - this.settingsAriaExtraLabelsContainer.id = 'settings_aria_extra_labels'; - // Add global labels here - const labelDiv = DOM.append(this.settingsAriaExtraLabelsContainer, $('.settings-aria-extra-label')); - labelDiv.id = 'settings_aria_more_actions_shortcut_label'; - labelDiv.setAttribute('aria-label', ''); - this.settingRenderers = this.instantiationService.createInstance(SettingTreeRenderers); this._register(this.settingRenderers.onDidChangeSetting(e => this.onDidChangeSetting(e.key, e.value, e.type))); this._register(this.settingRenderers.onDidOpenSettings(settingKey => { -- GitLab