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

Exit indirectly via controller (fixes #147)

Browse Source
This commit is contained in:
John Firebaugh
2012-12-03 16:21:42 -05:00
parent b3853e6485
commit 1972711a66
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/modes.js
+6 -6
View File
@@ -36,11 +36,11 @@ iD.modes.AddPlace = {
n._poi = true;
this.map.perform(iD.actions.addNode(n));
this.map.selectEntity(n);
this.exit();
this.controller.exit();
}.bind(this));
d3.select(document).on('keydown.addplace', function() {
if (d3.event.keyCode === 27) this.exit();
if (d3.event.keyCode === 27) this.controller.exit();
}.bind(this));
},
exit: function() {
@@ -140,7 +140,7 @@ iD.modes.AddRoad = {
surface.on('click.addroad', addRoad.bind(this));
d3.select(document).on('keydown.addroad', function() {
if (d3.event.keyCode === 27) this.exit();
if (d3.event.keyCode === 27) this.controller.exit();
}.bind(this));
},
exit: function() {
@@ -204,7 +204,7 @@ iD.modes.DrawRoad = function(way_id, direction) {
this.map.perform(iD.actions.changeTags(way, way.tags));
this.map.selectEntity(way);
// End by clicking on own tail
return this.exit();
return this.controller.exit();
} else {
// connect a way to an existing way
node = t.data()[0];
@@ -289,7 +289,7 @@ iD.modes.AddArea = {
surface.on('click.addarea', addArea.bind(this));
d3.select(document).on('keydown.addarea', function() {
if (d3.event.keyCode === 27) this.exit();
if (d3.event.keyCode === 27) this.controller.exit();
}.bind(this));
},
exit: function() {
@@ -342,7 +342,7 @@ iD.modes.DrawArea = function(way_id) {
delete way.tags.elastic;
this.map.perform(iD.actions.changeTags(way, way.tags));
// End by clicking on own tail
return this.exit();
return this.controller.exit();
} else {
// connect a way to an existing way
node = t.data()[0];
js/id/controller/controller.js
+5 -1
View File
@@ -16,7 +16,11 @@ iD.Controller = function(map) {
event.enter(mode);
};
controller.enter(iD.modes.Move);
controller.exit = function() {
controller.enter(iD.modes.Move);
};
controller.exit();
return d3.rebind(controller, event, 'on');
};