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

This commit is contained in:
Tom MacWright
2013-03-05 18:00:02 -05:00
2 changed files with 13 additions and 8 deletions
+5 -4
View File
@@ -23,14 +23,15 @@ iD.behavior.AddWay = function(context) {
.minzoom(0)
.tail(false);
window.setTimeout(function() {
context.map().dblclickEnable(true);
}, 1000);
surface.call(draw.off);
};
addWay.cancel = function() {
window.setTimeout(function() {
context.map().dblclickEnable(true);
}, 1000);
context.enter(iD.modes.Browse(context));
};
+8 -4
View File
@@ -87,10 +87,6 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
.minzoom(0)
.tail(false);
window.setTimeout(function() {
context.map().dblclickEnable(true);
}, 1000);
surface.call(draw.off)
.selectAll('.way, .node')
.classed('active', false);
@@ -159,6 +155,10 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
context.pop();
finished = true;
window.setTimeout(function() {
context.map().dblclickEnable(true);
}, 1000);
var way = context.entity(wayId);
if (way) {
context.enter(iD.modes.Select(context, [way.id], true));
@@ -173,6 +173,10 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
d3.functor(baseGraph),
t('operations.cancel_draw.annotation'));
window.setTimeout(function() {
context.map().dblclickEnable(true);
}, 1000);
finished = true;
context.enter(iD.modes.Browse(context));
};