diff --git a/modules/ui/fields/access.js b/modules/ui/fields/access.js index 690deadc3..0c781a7c3 100644 --- a/modules/ui/fields/access.js +++ b/modules/ui/fields/access.js @@ -46,8 +46,7 @@ export function uiFieldAccess(field, context) { .attr('class', 'preset-input-access-wrap') .append('input') .attr('type', 'text') - .attr('class', 'preset-input-access') - .attr('id', function(d) { return 'preset-input-access-' + d; }) + .attr('class', function(d) { return 'preset-input-access preset-input-access-' + d; }) .call(utilNoAuto) .each(function(d) { d3_select(this) @@ -205,7 +204,7 @@ export function uiFieldAccess(field, context) { return tags.access ? tags.access : field.placeholder(); }); - items.selectAll('#preset-input-access-access') + items.selectAll('.preset-input-access-access') .attr('placeholder', 'yes'); var which = tags.highway; @@ -214,7 +213,7 @@ export function uiFieldAccess(field, context) { var keys = Object.keys(placeholders[which]); keys.forEach(function(k) { var v = placeholders[which][k]; - items.selectAll('#preset-input-access-' + k) + items.selectAll('.preset-input-access-' + k) .attr('placeholder', tags.access || v); }); }; diff --git a/test/spec/ui/fields/access.js b/test/spec/ui/fields/access.js index 4c8feadc1..81a7c8a6c 100644 --- a/test/spec/ui/fields/access.js +++ b/test/spec/ui/fields/access.js @@ -44,10 +44,10 @@ describe('iD.uiFieldAccess', function() { selection.call(access); access.tags({highway: 'steps'}); - expect(selection.selectAll('#preset-input-access-foot').attr('placeholder')).to.equal('yes'); + expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('yes'); access.tags({highway: 'pedestrian'}); - expect(selection.selectAll('#preset-input-access-foot').attr('placeholder')).to.equal('yes'); + expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('yes'); }); it('sets foot placeholder to "designated" for footways', function() { @@ -55,7 +55,7 @@ describe('iD.uiFieldAccess', function() { selection.call(access); access.tags({highway: 'footway'}); - expect(selection.selectAll('#preset-input-access-foot').attr('placeholder')).to.equal('designated'); + expect(selection.selectAll('.preset-input-access-foot').attr('placeholder')).to.equal('designated'); }); it('sets bicycle placeholder to "designated" for cycleways', function() { @@ -63,7 +63,7 @@ describe('iD.uiFieldAccess', function() { selection.call(access); access.tags({highway: 'cycleway'}); - expect(selection.selectAll('#preset-input-access-bicycle').attr('placeholder')).to.equal('designated'); + expect(selection.selectAll('.preset-input-access-bicycle').attr('placeholder')).to.equal('designated'); }); it('sets horse placeholder to "designated" for bridleways', function() { @@ -71,7 +71,7 @@ describe('iD.uiFieldAccess', function() { selection.call(access); access.tags({highway: 'bridleway'}); - expect(selection.selectAll('#preset-input-access-horse').attr('placeholder')).to.equal('designated'); + expect(selection.selectAll('.preset-input-access-horse').attr('placeholder')).to.equal('designated'); }); it('sets motor_vehicle placeholder to "no" for footways, steps, pedestrian, cycleway, bridleway, and path', function() { @@ -79,7 +79,7 @@ describe('iD.uiFieldAccess', function() { selection.call(access); ['footway', 'steps', 'pedestrian', 'cycleway', 'bridleway', 'path'].forEach(function(value) { access.tags({highway: value}); - expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('no'); + expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('no'); }); }); @@ -89,7 +89,7 @@ describe('iD.uiFieldAccess', function() { ['residential', 'motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'service', 'unclassified', 'motorway_link', 'trunk_link', 'primary_link', 'secondary_link', 'tertiary_link'].forEach(function(value) { access.tags({highway: value}); - expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('yes'); + expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('yes'); }); }); @@ -98,10 +98,10 @@ describe('iD.uiFieldAccess', function() { selection.call(access); access.tags({highway: 'service', access: 'emergency'}); - expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('emergency'); + expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('emergency'); access.tags({highway: 'cycleway', access: 'permissive'}); - expect(selection.selectAll('#preset-input-access-bicycle').attr('placeholder')).to.equal('permissive'); + expect(selection.selectAll('.preset-input-access-bicycle').attr('placeholder')).to.equal('permissive'); }); it('overrides a "no" placeholder with more specific access tag (#2763)', function() { @@ -109,7 +109,7 @@ describe('iD.uiFieldAccess', function() { selection.call(access); access.tags({highway: 'cycleway', access: 'destination'}); - expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('destination'); + expect(selection.selectAll('.preset-input-access-motor_vehicle').attr('placeholder')).to.equal('destination'); }); });