From d200e76c4902ea4904915a6511386a9bf1d981aa Mon Sep 17 00:00:00 2001 From: Christopher Leidigh Date: Fri, 24 Aug 2018 01:32:16 -0400 Subject: [PATCH] Settings: Only add label target for checkbox (#57129) --- .../parts/preferences/browser/settingsTree.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts index 964371c14b2..21d0bb57bee 100644 --- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts @@ -678,11 +678,11 @@ export class SettingsRenderer implements ITreeRenderer { // Also have to ignore embedded links - too buried to stop propagation toDispose.push(DOM.addDisposableListener(descriptionElement, DOM.EventType.MOUSE_DOWN, (e) => { const targetElement = e.toElement; - const targetId = descriptionElement.getAttribute('checkboxLabelTargetId'); + const targetId = descriptionElement.getAttribute('checkbox-label-target-id'); // Make sure we are not a link and the target ID matches // Toggle target checkbox - if (targetElement.tagName !== 'A' && targetId === template.checkbox.domNode.id) { + if (targetElement.tagName.toLowerCase() !== 'a' && targetId === template.checkbox.domNode.id) { template.checkbox.checked = template.checkbox.checked ? false : true; } DOM.EventHelper.stop(e); @@ -949,9 +949,11 @@ 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 (templateId === SETTINGS_BOOL_TEMPLATE_ID) { + // Add checkbox target to description clickable and able to toggle checkbox + const checkbox_id = (element.displayCategory + '_' + element.displayLabel).replace(/ /g, '_') + '_Item'; + template.descriptionElement.setAttribute('checkbox-label-target-id', checkbox_id); + } if (element.overriddenScopeList.length) { let otherOverridesLabel = element.isConfigured ? -- GitLab