Fix merge

This commit is contained in:
John Firebaugh
2012-11-25 20:46:51 -04:00
parent ec54137e4d
commit 5ccdae6534
+6 -6
View File
@@ -18,21 +18,21 @@ var iD = function(container) {
.attr('id', 'place')
.html('+ Place')
.on('click', function() {
controller.go(iD.actions.AddPlace);
controller.enter(iD.modes.AddPlace);
});
bar.append('button')
.attr('id', 'road')
.html('+ Road')
.on('click', function() {
controller.go(iD.actions.AddRoad);
controller.enter(iD.modes.AddRoad);
});
bar.append('button')
.attr('id', 'area')
.html('+ Area')
.on('click', function() {
controller.go(iD.actions.AddArea);
controller.enter(iD.modes.AddArea);
});
bar.append('button')
@@ -135,11 +135,11 @@ var iD = function(container) {
map.redo();
}
// p
if (d3.event.which === 80) controller.go(iD.actions.AddPlace);
if (d3.event.which === 80) controller.enter(iD.modes.AddPlace);
// r
if (d3.event.which === 82) controller.go(iD.actions.AddRoad);
if (d3.event.which === 82) controller.enter(iD.modes.AddRoad);
// a
if (d3.event.which === 65) controller.go(iD.actions.AddArea);
if (d3.event.which === 65) controller.enter(iD.modes.AddArea);
});
var hash = iD.Hash().map(map);