From dcf2c1e7f44b87c7918a11ac0c0b4b65ea17abce Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Tue, 26 Mar 2013 18:20:48 -0400
Subject: [PATCH] lasso works if shift is released before mouseup

fixes #1156
---
 js/id/behavior/select.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/id/behavior/select.js b/js/id/behavior/select.js
index 1b3adb6fe..6b955b343 100644
--- a/js/id/behavior/select.js
+++ b/js/id/behavior/select.js
@@ -15,11 +15,12 @@ iD.behavior.Select = function(context) {
 
     function click() {
         var datum = d3.event.target.__data__;
+        var lasso = d3.select('#surface .lasso').node();
         if (!(datum instanceof iD.Entity)) {
-            if (!d3.event.shiftKey)
+            if (!d3.event.shiftKey && !lasso)
                 context.enter(iD.modes.Browse(context));
 
-        } else if (!d3.event.shiftKey) {
+        } else if (!d3.event.shiftKey && !lasso) {
             // Avoid re-entering Select mode with same entity.
             if (context.selection().length !== 1 || context.selection()[0] !== datum.id) {
                 context.enter(iD.modes.Select(context, [datum.id]));