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

For fields that use entityID, recreate field if entityID changes

Browse Source 
(closes #5229, closes #4898)
This commit is contained in:
Bryan Housel
2018-08-16 11:07:38 -04:00
parent a0a54395a7
commit ef0636ad01
3 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/field.js
+3
View File
@@ -34,12 +34,15 @@ export function uiField(context, presetField, entity, options) {
var _tags = {};
// field implementation
field.impl = uiFields[field.type](field, context)
.on('change', function(t, onInput) {
dispatch.call('change', field, t, onInput);
});
// if this field cares about the entity, pass it along
if (entity && field.impl.entity) {
field.entityID = entity.id;
field.impl.entity(entity);
}
modules/ui/form_fields.js
+7 -8
View File
@@ -6,7 +6,7 @@ import { utilGetSetValue, utilNoAuto } from '../util';
export function uiFormFields(context) {
var fieldsArr;
var _fieldsArr;
function formFields(selection, klass) {
@@ -15,9 +15,8 @@ export function uiFormFields(context) {
function render(selection, klass) {
var shown = fieldsArr.filter(function(field) { return field.isShown(); }),
notShown = fieldsArr.filter(function(field) { return !field.isShown(); });
var shown = _fieldsArr.filter(function(field) { return field.isShown(); });
var notShown = _fieldsArr.filter(function(field) { return !field.isShown(); });
var container = selection.selectAll('.form-fields-container')
.data([0]);
@@ -29,7 +28,7 @@ export function uiFormFields(context) {
var fields = container.selectAll('.wrap-form-field')
.data(shown, function(d) { return d.id; });
.data(shown, function(d) { return d.id + (d.entityID || ''); });
fields.exit()
.remove();
@@ -112,9 +111,9 @@ export function uiFormFields(context) {
}
formFields.fieldsArr = function(_) {
if (!arguments.length) return fieldsArr;
fieldsArr = _;
formFields.fieldsArr = function(val) {
if (!arguments.length) return _fieldsArr;
_fieldsArr = val;
return formFields;
};
modules/ui/preset_editor.js
+39 -39
View File
@@ -14,13 +14,13 @@ import { utilRebind } from '../util';
export function uiPresetEditor(context) {
var dispatch = d3_dispatch('change'),
formFields = uiFormFields(context),
state,
fieldsArr,
preset,
tags,
entityId;
var dispatch = d3_dispatch('change');
var formFields = uiFormFields(context);
var _state;
var _fieldsArr;
var _preset;
var _tags;
var _entityID;
function presetEditor(selection) {
@@ -32,36 +32,36 @@ export function uiPresetEditor(context) {
function render(selection) {
if (!fieldsArr) {
var entity = context.entity(entityId),
geometry = context.geometry(entityId),
presets = context.presets();
if (!_fieldsArr) {
var entity = context.entity(_entityID);
var geometry = context.geometry(_entityID);
var presets = context.presets();
fieldsArr = [];
_fieldsArr = [];
preset.fields.forEach(function(field) {
_preset.fields.forEach(function(field) {
if (field.matchGeometry(geometry)) {
fieldsArr.push(
_fieldsArr.push(
uiField(context, field, entity)
);
}
});
if (entity.isHighwayIntersection(context.graph()) && presets.field('restrictions')) {
fieldsArr.push(
_fieldsArr.push(
uiField(context, presets.field('restrictions'), entity)
);
}
presets.universal().forEach(function(field) {
if (preset.fields.indexOf(field) === -1) {
fieldsArr.push(
if (_preset.fields.indexOf(field) === -1) {
_fieldsArr.push(
uiField(context, field, entity, { show: false })
);
}
});
fieldsArr.forEach(function(field) {
_fieldsArr.forEach(function(field) {
field
.on('change', function(t, onInput) {
dispatch.call('change', field, t, onInput);
@@ -69,15 +69,15 @@ export function uiPresetEditor(context) {
});
}
fieldsArr.forEach(function(field) {
_fieldsArr.forEach(function(field) {
field
.state(state)
.tags(tags);
.state(_state)
.tags(_tags);
});
selection
.call(formFields.fieldsArr(fieldsArr), 'inspector-inner fillL3');
.call(formFields.fieldsArr(_fieldsArr), 'inspector-inner fillL3');
selection.selectAll('.wrap-form-field input')
@@ -90,35 +90,35 @@ export function uiPresetEditor(context) {
}
presetEditor.preset = function(_) {
if (!arguments.length) return preset;
if (preset && preset.id === _.id) return presetEditor;
preset = _;
fieldsArr = null;
presetEditor.preset = function(val) {
if (!arguments.length) return _preset;
if (_preset && _preset.id === val.id) return presetEditor;
_preset = val;
_fieldsArr = null;
return presetEditor;
};
presetEditor.state = function(_) {
if (!arguments.length) return state;
state = _;
presetEditor.state = function(val) {
if (!arguments.length) return _state;
_state = val;
return presetEditor;
};
presetEditor.tags = function(_) {
if (!arguments.length) return tags;
tags = _;
// Don't reset fieldsArr here.
presetEditor.tags = function(val) {
if (!arguments.length) return _tags;
_tags = val;
// Don't reset _fieldsArr here.
return presetEditor;
};
presetEditor.entityID = function(_) {
if (!arguments.length) return entityId;
if (entityId === _) return presetEditor;
entityId = _;
fieldsArr = null;
presetEditor.entityID = function(val) {
if (!arguments.length) return _entityID;
if (_entityID === val) return presetEditor;
_entityID = val;
_fieldsArr = null;
return presetEditor;
};