Merge branch 'master' of github.com:systemed/iD

This commit is contained in:
Saman Bemel-Benrud
2012-12-14 16:30:47 -05:00
4 changed files with 14 additions and 10 deletions
+1 -1
View File
@@ -702,7 +702,7 @@ div.typeahead a:first-child {
.notice {
position:absolute;
top:60px;
top:0px;
left:70px;
width:250px;
height:50px;
+1 -1
View File
@@ -18,7 +18,7 @@ iD.modes.AddArea = function() {
map.surface.on('click.addarea', function() {
var datum = d3.select(d3.event.target).datum() || {},
way = iD.Way({tags: { building: 'yes', area: 'yes' }});
way = iD.Way({tags: { area: 'yes' }});
if (datum.type === 'node') {
// start from an existing node
+1 -1
View File
@@ -56,7 +56,7 @@ iD.Map = function() {
alength = arrow.node().getComputedTextLength();
arrow.remove();
notice = iD.notice(d3.select('body')
notice = iD.notice(supersurface
.append('div')
.attr('class', 'notice'));
+11 -7
View File
@@ -106,25 +106,29 @@ iD.Inspector = function() {
.on('keydown.push-more', pushMore)
.each(bindTypeahead);
removeBtn = row.append('button')
var removeBtn = row.append('button')
.attr('tabindex', -1)
.attr('class','remove minor')
.on('click', removeTag);
removeBtn.append('span').attr('class', 'icon remove');
helpBtn = row.append('button').attr('class', 'tag-help minor').append('a')
.attr('target', '_blank')
var helpBtn = row.append('button')
.attr('tabindex', -1)
.attr('href', function(d) {
return 'http://taginfo.openstreetmap.org/keys/' + d.key;
});
.attr('class', 'tag-help minor')
.append('a')
.attr('tabindex', -1)
.attr('target', '_blank')
.attr('href', function(d) {
return 'http://taginfo.openstreetmap.org/keys/' + d.key;
});
helpBtn.append('span').attr('class', 'icon inspect');
}
function grabtags() {
var grabbed = [];
function grab(d) { grabbed.push(d); }
function grab(d) { if (d.key !== '') grabbed.push(d); }
inspectorwrap.selectAll('li').each(grab);
return grabbed;
}