From d4e08550eb153af2e57612045cae3f275c51ec04 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 17 Dec 2012 10:55:40 -0800 Subject: [PATCH] Don't show help/remove buttons for empty row --- css/app.css | 24 ++++++++++++++---------- js/id/ui/inspector.js | 8 +++++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/css/app.css b/css/app.css index 7c260d9db..d7d35fb00 100644 --- a/css/app.css +++ b/css/app.css @@ -405,16 +405,6 @@ button.Browse .label { border-bottom: 1px solid #ccc; } -.inspector-inner button { - position: absolute; - top: 0; - right: 0; -} - -.inspector-inner button.tag-help { - right: 30px; -} - .inspector-wrap a.permalink { text-decoration:none; margin-right:1em; @@ -453,6 +443,20 @@ button.Browse .label { border-right: 1px solid #ccc; } +.tag-row button { + position: absolute; + top: 0; + right: 0; +} + +.tag-row-empty button { + display: none; +} + +.tag-row button.tag-help { + right: 30px; +} + .inspector-buttons { border-top: 1px solid #ccc; } diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index 573211fcc..78b726881 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -70,23 +70,25 @@ iD.Inspector = function() { } var li = inspectorwrap.selectAll('li') - .data(data, function(d) { return [d.key, d.value]; }); + .data(data, function(d) { return d.key; }); li.exit().remove(); var row = li.enter().append('li').attr('class','tag-row'); var inputs = row.append('div').attr('class','input-wrap'); + li.classed('tag-row-empty', emptyTag); + inputs.append('input') .property('type', 'text') .attr('class', 'key') - .property('value', function(d, i) { return d.key; }) + .property('value', function(d) { return d.key; }) .on('keyup.update', setKey); inputs.append('input') .property('type', 'text') .attr('class', 'value') - .property('value', function(d, i) { return d.value; }) + .property('value', function(d) { return d.value; }) .on('keyup.update', setValue) .on('keydown.push-more', pushMore) .each(bindTypeahead);