Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Settings: Allow description to toggle checkbox Fixes: #54053 (#57103)

Browse Source
This commit is contained in:
Christopher Leidigh
2018-08-23 15:42:58 -04:00
committed by GitHub
parent f0e2534ad1
commit 7756abfff9
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/preferences/browser/settingsTree.ts
+21 -2
View File
@@ -673,6 +673,21 @@ export class SettingsRenderer implements ITreeRenderer {
template.onChange(checkbox.checked);
}
}));
// Need to listen for mouse clicks on description and toggle checkbox - use target ID for safety
// Also have to ignore embedded links - too buried to stop propagation
toDispose.push(DOM.addDisposableListener(descriptionElement, DOM.EventType.MOUSE_DOWN, (e) => {
const targetElement = <HTMLElement>e.toElement;
const targetId = descriptionElement.getAttribute('checkboxLabelTargetId');
// Make sure we are not a link and the target ID matches
// Toggle target checkbox
if (targetElement.tagName !== 'A' && targetId === template.checkbox.domNode.id) {
template.checkbox.checked = template.checkbox.checked ? false : true;
}
DOM.EventHelper.stop(e);
}));
checkbox.domNode.classList.add(SettingsRenderer.CONTROL_CLASS);
const toolbar = this.renderSettingToolbar(container);
toDispose.push(toolbar);
@@ -917,6 +932,10 @@ export class SettingsRenderer implements ITreeRenderer {
template.descriptionElement.innerText = element.description;
}
// Add checkbox target to description clickable and able to toggle checkbox
const checkbox_id = (element.displayCategory + '_' + element.displayLabel).replace(/ /g, '_') + '_Item';
template.descriptionElement.setAttribute('checkboxLabelTargetId', checkbox_id);
if (element.overriddenScopeList.length) {
let otherOverridesLabel = element.isConfigured ?
localize('alsoConfiguredIn', "Also modified in") :
@@ -988,9 +1007,9 @@ export class SettingsRenderer implements ITreeRenderer {
// Labels will not be read on descendent input elements of the parent treeitem
// unless defined as role=treeitem and indirect aria-labelledby approach
// TODO: Determine method to normally label input items with value read last
template.checkbox.domNode.setAttribute('id', id + 'item');
template.checkbox.domNode.setAttribute('id', id + '_Item');
template.checkbox.domNode.setAttribute('role', 'treeitem');
template.checkbox.domNode.setAttribute('aria-labelledby', id + 'item ' + id);
template.checkbox.domNode.setAttribute('aria-labelledby', id + '_Item ' + id);
}