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

Access field should allow "yes" placeholders to be overridden (#2213)

Browse Source
This commit is contained in:
Bryan Housel
2014-05-02 15:30:00 -04:00
parent 14efaee004
commit 004be4bb9a
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/id/ui/preset/access.js
View File

@@ -140,7 +140,13 @@ iD.ui.preset.access = function(field) {
_.forEach(placeholders[tags.highway], function(value, key) {
items.selectAll('#preset-input-access-' + key)
.attr('placeholder', value);
.attr('placeholder', function() {
if (value === 'yes') {
return tags.access ? tags.access : value;
} else {
return value;
}
});
});
};

17
test/spec/ui/preset/access.js
View File

@@ -74,4 +74,21 @@ describe('iD.ui.preset.access', function() {
expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('yes');
});
});
it('overrides a "yes" placeholder with more specific access tag (#2213)', function() {
var access = iD.ui.preset.access(field);
selection.call(access);
access.tags({highway: 'service', access: 'emergency'});
expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('emergency');
});
it('does not override a "no" placeholder with more specific access tag (#2213)', function() {
var access = iD.ui.preset.access(field);
selection.call(access);
access.tags({highway: 'cycleway', access: 'destination'});
expect(selection.selectAll('#preset-input-access-motor_vehicle').attr('placeholder')).to.equal('no');
});
});