From b3262a71dc2cdd5b8811ebac6664037d22cfa6e3 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 31 Jan 2020 10:49:31 -0500 Subject: [PATCH] Use newlines instead of semicolons to separate mutliselection tag values in tooltips (re: #7306) --- modules/ui/fields/access.js | 2 +- modules/ui/fields/address.js | 2 +- modules/ui/fields/combo.js | 2 +- modules/ui/fields/cycleway.js | 2 +- modules/ui/fields/input.js | 2 +- modules/ui/fields/localized.js | 4 ++-- modules/ui/fields/maxspeed.js | 2 +- modules/ui/fields/textarea.js | 2 +- modules/ui/fields/wikidata.js | 2 +- modules/ui/raw_tag_editor.js | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/ui/fields/access.js b/modules/ui/fields/access.js index 690e2b186..294c70af8 100644 --- a/modules/ui/fields/access.js +++ b/modules/ui/fields/access.js @@ -214,7 +214,7 @@ export function uiFieldAccess(field, context) { return tags[d] && Array.isArray(tags[d]); }) .attr('title', function(d) { - return tags[d] && Array.isArray(tags[d]) && tags[d].filter(Boolean).join('; '); + return tags[d] && Array.isArray(tags[d]) && tags[d].filter(Boolean).join('\n'); }) .attr('placeholder', function(d) { if (tags[d] && Array.isArray(tags[d])) { diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js index 8bb4cc10c..f71563986 100644 --- a/modules/ui/fields/address.js +++ b/modules/ui/fields/address.js @@ -277,7 +277,7 @@ export function uiFieldAddress(field, context) { }) .attr('title', function(subfield) { var val = tags[field.key + ':' + subfield.id]; - return val && Array.isArray(val) && val.filter(Boolean).join('; '); + return val && Array.isArray(val) && val.filter(Boolean).join('\n'); }) .classed('mixed', function(subfield) { return Array.isArray(tags[field.key + ':' + subfield.id]); diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js index 0c51d3f15..1782c3c99 100644 --- a/modules/ui/fields/combo.js +++ b/modules/ui/fields/combo.js @@ -551,7 +551,7 @@ export function uiFieldCombo(field, context) { }).filter(Boolean); utilGetSetValue(input, !isMixed ? displayValue(tags[field.key]) : '') - .attr('title', isMixed ? mixedValues.join('; ') : undefined) + .attr('title', isMixed ? mixedValues.join('\n') : undefined) .attr('placeholder', isMixed ? t('inspector.multiple_values') : _staticPlaceholder || '') .classed('mixed', isMixed); } diff --git a/modules/ui/fields/cycleway.js b/modules/ui/fields/cycleway.js index 80f11f3ab..8659be230 100644 --- a/modules/ui/fields/cycleway.js +++ b/modules/ui/fields/cycleway.js @@ -144,7 +144,7 @@ export function uiFieldCycleway(field, context) { if (Array.isArray(tags[d])) { vals = vals.concat(tags[d]); } - return vals.filter(Boolean).join('; '); + return vals.filter(Boolean).join('\n'); } return null; }) diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js index a48400175..514f5833c 100644 --- a/modules/ui/fields/input.js +++ b/modules/ui/fields/input.js @@ -195,7 +195,7 @@ export function uiFieldText(field, context) { var isMixed = Array.isArray(tags[field.key]); utilGetSetValue(input, !isMixed && tags[field.key] ? tags[field.key] : '') - .attr('title', isMixed ? tags[field.key].filter(Boolean).join('; ') : undefined) + .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : undefined) .attr('placeholder', isMixed ? t('inspector.multiple_values') : (field.placeholder() || t('inspector.unknown'))) .classed('mixed', isMixed); diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js index 9b226976f..8073b7d43 100644 --- a/modules/ui/fields/localized.js +++ b/modules/ui/fields/localized.js @@ -565,7 +565,7 @@ export function uiFieldLocalized(field, context) { return typeof d.value === 'string' ? d.value : ''; }) .attr('title', function(d) { - return Array.isArray(d.value) ? d.value.filter(Boolean).join('; ') : null; + return Array.isArray(d.value) ? d.value.filter(Boolean).join('\n') : null; }) .attr('placeholder', function(d) { return Array.isArray(d.value) ? t('inspector.multiple_values') : t('translate.localized_translation_name'); @@ -594,7 +594,7 @@ export function uiFieldLocalized(field, context) { var isMixed = Array.isArray(tags[field.key]); utilGetSetValue(input, typeof tags[field.key] === 'string' ? tags[field.key] : '') - .attr('title', isMixed ? tags[field.key].filter(Boolean).join('; ') : undefined) + .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : undefined) .attr('placeholder', isMixed ? t('inspector.multiple_values') : field.placeholder()) .classed('mixed', isMixed); diff --git a/modules/ui/fields/maxspeed.js b/modules/ui/fields/maxspeed.js index 45c2c22b6..bfd9b0f55 100644 --- a/modules/ui/fields/maxspeed.js +++ b/modules/ui/fields/maxspeed.js @@ -129,7 +129,7 @@ export function uiFieldMaxspeed(field, context) { setUnitSuggestions(); utilGetSetValue(input, typeof value === 'string' ? value : '') - .attr('title', isMixed ? value.filter(Boolean).join('; ') : null) + .attr('title', isMixed ? value.filter(Boolean).join('\n') : null) .attr('placeholder', isMixed ? t('inspector.multiple_values') : field.placeholder()) .classed('mixed', isMixed); }; diff --git a/modules/ui/fields/textarea.js b/modules/ui/fields/textarea.js index c637d96fe..f379ee007 100644 --- a/modules/ui/fields/textarea.js +++ b/modules/ui/fields/textarea.js @@ -60,7 +60,7 @@ export function uiFieldTextarea(field, context) { var isMixed = Array.isArray(tags[field.key]); utilGetSetValue(input, !isMixed && tags[field.key] ? tags[field.key] : '') - .attr('title', isMixed ? tags[field.key].filter(Boolean).join('; ') : undefined) + .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : undefined) .attr('placeholder', isMixed ? t('inspector.multiple_values') : (field.placeholder() || t('inspector.unknown'))) .classed('mixed', isMixed); }; diff --git a/modules/ui/fields/wikidata.js b/modules/ui/fields/wikidata.js index 0bd1004b6..1d9455ad5 100644 --- a/modules/ui/fields/wikidata.js +++ b/modules/ui/fields/wikidata.js @@ -286,7 +286,7 @@ export function uiFieldWikidata(field, context) { var isMixed = Array.isArray(tags[field.key]); d3_select('li.wikidata-search input') - .attr('title', isMixed ? tags[field.key].filter(Boolean).join('; ') : null) + .attr('title', isMixed ? tags[field.key].filter(Boolean).join('\n') : null) .attr('placeholder', isMixed ? t('inspector.multiple_values') : '') .classed('mixed', isMixed); diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js index 4733e1309..8e3abdd93 100644 --- a/modules/ui/raw_tag_editor.js +++ b/modules/ui/raw_tag_editor.js @@ -282,7 +282,7 @@ export function uiRawTagEditor(context) { items.selectAll('input.value') .attr('title', function(d) { - return Array.isArray(d.value) ? d.value.filter(Boolean).join('; ') : d.value; + return Array.isArray(d.value) ? d.value.filter(Boolean).join('\n') : d.value; }) .classed('mixed', function(d) { return Array.isArray(d.value);