CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 13:18:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support using delete/backspace on focused, readonly combo fields

Browse Source 
Make custom combo field values lowercase if they're also made snake_case
This commit is contained in:
Quincy Morgan
2020-12-09 15:26:45 -05:00
parent cb7f1c2b3c
commit c8c288d6a3
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/fields/combo.js
+21 -3
View File
@@ -8,6 +8,8 @@ import { osmEntity } from '../../osm/entity';
import { t } from '../../core/localizer';
import { services } from '../../services';
import { uiCombobox } from '../combobox';
import { utilKeybinding } from '../../util/keybinding';
import { utilArrayUniq, utilGetSetValue, utilNoAuto, utilRebind, utilTotalExtent, utilUnicodeCharsCount } from '../../util';
export {
@@ -55,7 +57,7 @@ export function uiFieldCombo(field, context) {
function snake(s) {
return s.replace(/\s+/g, '_');
return s.replace(/\s+/g, '_').toLowerCase();
}
function clean(s) {
@@ -544,13 +546,29 @@ export function uiFieldCombo(field, context) {
var isRawValue = showsValue && !field.hasTextForStringId('options.' + tags[field.key]);
var isKnownValue = showsValue && !isRawValue;
var isReadOnly = !_allowCustomValues || isKnownValue;
utilGetSetValue(_input, !isMixed ? displayValue(tags[field.key]) : '')
.classed('raw-value', isRawValue)
.classed('known-value', isKnownValue)
.attr('readonly', (!_allowCustomValues || isKnownValue) ? 'readonly' : undefined)
.attr('readonly', isReadOnly ? 'readonly' : undefined)
.attr('title', isMixed ? mixedValues.join('\n') : undefined)
.attr('placeholder', isMixed ? t('inspector.multiple_values') : _staticPlaceholder || '')
.classed('mixed', isMixed);
.classed('mixed', isMixed)
.on('keydown.deleteCapture', function(d3_event) {
if (isReadOnly &&
isKnownValue &&
(d3_event.keyCode === utilKeybinding.keyCodes['⌫'] ||
d3_event.keyCode === utilKeybinding.keyCodes['⌦'])) {
d3_event.preventDefault();
d3_event.stopPropagation();
var t = {};
t[field.key] = undefined;
dispatch.call('change', this, t);
}
});
}
};