From bb744c018cdc174cbc7b36950ad33b77e3cccb54 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Tue, 1 Aug 2017 00:54:36 +0100 Subject: [PATCH 1/4] Don't force name tags --- modules/ui/preset.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/ui/preset.js b/modules/ui/preset.js index 4e93d4770..fac5ce203 100644 --- a/modules/ui/preset.js +++ b/modules/ui/preset.js @@ -105,10 +105,6 @@ export function uiPreset(context) { fieldsArr = []; - if (presets.field('name')) { - fieldsArr.push(UIField(presets.field('name'), entity)); - } - preset.fields.forEach(function(field) { if (field.matchGeometry(geometry)) { fieldsArr.push(UIField(field, entity, true)); From 6cbae830c22d307d3fbd8ab3dbf88d9f64a905a7 Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Tue, 1 Aug 2017 16:26:32 +0100 Subject: [PATCH 2/4] Fix name push bug --- data/presets/fields.json | 1 + data/presets/fields/name.json | 1 + modules/ui/preset.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/presets/fields.json b/data/presets/fields.json index 3c603245b..ead82bb63 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1086,6 +1086,7 @@ "key": "name", "type": "localized", "label": "Name", + "universal": true, "placeholder": "Common name (if any)" }, "natural": { diff --git a/data/presets/fields/name.json b/data/presets/fields/name.json index 361701ce1..8ee1bd101 100644 --- a/data/presets/fields/name.json +++ b/data/presets/fields/name.json @@ -2,5 +2,6 @@ "key": "name", "type": "localized", "label": "Name", + "universal": true, "placeholder": "Common name (if any)" } diff --git a/modules/ui/preset.js b/modules/ui/preset.js index fac5ce203..e344f6039 100644 --- a/modules/ui/preset.js +++ b/modules/ui/preset.js @@ -40,7 +40,7 @@ export function uiPreset(context) { field.show = show; field.shown = function() { - return field.id === 'name' || field.show || _.some(field.keys, function(key) { return !!tags[key]; }); + return field.id === '' || field.show || _.some(field.keys, function(key) { return !!tags[key]; }); }; field.modified = function() { From f69463b5c83712cc7a2eac438932f86d88be98ab Mon Sep 17 00:00:00 2001 From: JamesKingdom Date: Tue, 1 Aug 2017 16:45:10 +0100 Subject: [PATCH 3/4] Removing blank field --- modules/ui/preset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui/preset.js b/modules/ui/preset.js index e344f6039..fd1defff1 100644 --- a/modules/ui/preset.js +++ b/modules/ui/preset.js @@ -40,7 +40,7 @@ export function uiPreset(context) { field.show = show; field.shown = function() { - return field.id === '' || field.show || _.some(field.keys, function(key) { return !!tags[key]; }); + return field.show || _.some(field.keys, function(key) { return !!tags[key]; }); }; field.modified = function() { From ea93ecdbdce12cccacea42294a71c037550e0ca1 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 1 Aug 2017 13:04:33 -0400 Subject: [PATCH 4/4] Hide the preset form div if there are no fields in it --- css/80_app.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/80_app.css b/css/80_app.css index da31692a2..edd94ac5b 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -1039,6 +1039,10 @@ button.save.has-count .count::before { border-radius: 8px; } +.inspector-preset .preset-form:empty { + display: none; +} + .entity-editor-pane .preset-list-item .preset-list-button-wrap { margin-bottom: 0; }