From 3fdf32f4dd435ebfdee6248187db92bf7bda9add Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Fri, 11 Jan 2013 10:20:34 -0500
Subject: [PATCH] Add ctrl-z and make it work nicely with drawline

---
 js/id/id.js              |  4 ++--
 js/id/modes/draw_line.js | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/js/id/id.js b/js/id/id.js
index 7c3e91129..3e3c4a1b7 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -198,8 +198,8 @@ window.iD = function(container) {
                 controller.enter(iD.modes.AddLine());
             })
             .on('z', function(evt, mods) {
-                if (mods === '⇧⌘') history.redo();
-                if (mods === '⌘') history.undo();
+                if (mods === '⇧⌘' || mods === '⌃⇧') history.redo();
+                if (mods === '⌘' || mods === '⌃') history.undo();
             });
 
         var hash = iD.Hash().map(map);
diff --git a/js/id/modes/draw_line.js b/js/id/modes/draw_line.js
index 9f4ee548c..f04d2684c 100644
--- a/js/id/modes/draw_line.js
+++ b/js/id/modes/draw_line.js
@@ -116,6 +116,11 @@ iD.modes.DrawLine = function(wayId, direction) {
             controller.enter(iD.modes.Browse());
         }
 
+        function undo() {
+            history.undo();
+            controller.enter(iD.modes.Browse());
+        }
+
         surface
             .on('mousemove.drawline', mousemove)
             .on('click.drawline', click);
@@ -124,12 +129,13 @@ iD.modes.DrawLine = function(wayId, direction) {
             .on('⎋.drawline', esc)
             .on('⌫.drawline', backspace)
             .on('⌦.drawline', del)
-            .on('↩.drawline', ret);
+            .on('↩.drawline', ret)
+            .on('z.drawline', function(evt, mods) {
+                if (mods === '⌘' || mods === '⌃') undo();
+            });
+
+        d3.select('#undo').on('click.drawline', undo);
 
-        d3.select('#undo').on('click.drawline', function() {
-            history.undo();
-            controller.enter(iD.modes.Browse());
-        });
 
     };