From 2ecce0e47eca9038b1a1035523dba0fff38bfc58 Mon Sep 17 00:00:00 2001 From: Gabor Hodi Date: Sun, 23 Jan 2022 18:51:14 +0100 Subject: [PATCH] [Issue8871] Do not open disabled localized combobox when clicking on it --- modules/ui/combobox.js | 2 ++ modules/ui/fields/localized.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/ui/combobox.js b/modules/ui/combobox.js index 57555078f..df3d13700 100644 --- a/modules/ui/combobox.js +++ b/modules/ui/combobox.js @@ -77,6 +77,7 @@ export function uiCombobox(context, klass) { function mousedown(d3_event) { if (d3_event.button !== 0) return; // left click only + if (input.classed('disabled')) return; _tDown = +new Date(); // clear selection @@ -95,6 +96,7 @@ export function uiCombobox(context, klass) { function mouseup(d3_event) { input.on('mouseup.combo-input', null); if (d3_event.button !== 0) return; // left click only + if (input.classed('disabled')) return; if (input.node() !== document.activeElement) return; // exit if this input is not focused var start = input.property('selectionStart'); diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index ac02435ab..547eed76b 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -213,7 +213,7 @@ export function uiFieldLocalized(field, context) { localizedInputs.selectAll('button, input') .classed('disabled', !!isLocked) .attr('readonly', isLocked || null); - + selection.selectAll('.combobox-caret').classed('nope', true); function addNew(d3_event) {