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

Dropdown fixes

Browse Source
This commit is contained in:
Aaron Lidman
2014-10-29 18:24:32 -04:00
parent 5c5649f3d8
commit 554dc77cef
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/id/ui/preset.js
View File

@@ -164,37 +164,32 @@ iD.ui.preset = function(context) {
};
});
function notShown_placeholder() {
var placeholder = [];
for (var field in notShown) {
placeholder.push(notShown[field].title);
}
return placeholder.slice(0,3).join(', ') + ((placeholder.length > 3) ? '…' : '');
}
var $more = $form.selectAll('.more-fields')
.data((notShown.length > 0) ? [0] : []);
var $input = $more.selectAll('.value')
.data([0]);
$more.enter().append('div')
.attr('class', 'more-fields')
.append('label')
.text('Add additional fields');
var $input = $more.selectAll('.value')
.data([0]);
$input.enter().append('input')
.attr('class', 'value')
.attr('type', 'text')
.attr('placeholder', notShown_placeholder);
.attr('type', 'text');
$input.call(d3.combobox().data(notShown)
.minItems(1)
.on('accept', function(item) {
show(item);
$input.value('')
.attr('placeholder', notShown_placeholder);
}));
$input.value('')
.attr('placeholder', function() {
var placeholder = [];
for (var field in notShown) {
placeholder.push(notShown[field].title);
}
return placeholder.slice(0,3).join(', ') + ((placeholder.length > 3) ? '…' : '');
})
.call(d3.combobox().data(notShown)
.minItems(1)
.on('accept', show));
$more.exit()
.remove();

3
js/id/ui/preset/address.js
View File

@@ -203,7 +203,8 @@ iD.ui.preset.address = function(field, context) {
};
address.focus = function() {
wrap.selectAll('input').node().focus();
var node = wrap.selectAll('input').node();
if (node) node.focus();
};
return d3.rebind(address, event, 'on');