From bd48cfced0ec4536ff0e25e2eb0cc33eaf7133fc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 28 Mar 2013 22:06:56 -0400
Subject: [PATCH] Don't track ctrl-click as the start of a selection

Closes #396
---
 spec/app/editor-spec.coffee | 14 ++++++++++++++
 src/app/editor.coffee       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index 885981485..915a4e872 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -572,6 +572,20 @@ describe "Editor", ->
         expect(range.start).toEqual({row: 4, column: 10})
         expect(range.end).toEqual({row: 4, column: 10})
 
+      it "ignores ctrl-click and drags", ->
+        editor.attachToDom()
+        editor.css(position: 'absolute', top: 10, left: 10)
+
+        event = mousedownEvent(editor: editor, point: [4, 10])
+        event.ctrlKey = true
+        editor.renderedLines.trigger(event)
+        $(document).trigger mousemoveEvent(editor: editor, point: [5, 27])
+        $(document).trigger 'mouseup'
+
+        range = editor.getSelection().getScreenRange()
+        expect(range.start).toEqual({row: 4, column: 10})
+        expect(range.end).toEqual({row: 4, column: 10})
+
     describe "double-click and drag", ->
       it "selects the word under the cursor, then continues to select by word in either direction as the mouse is dragged", ->
         expect(editor.getCursorScreenPosition()).toEqual(row: 0, column: 0)
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 9377de760..2f383f87d 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -373,7 +373,7 @@ class Editor extends View
       else if clickCount == 3
         @activeEditSession.selectLine() unless e.shiftKey
 
-      @selectOnMousemoveUntilMouseup() unless e.originalEvent.which > 1
+      @selectOnMousemoveUntilMouseup() unless e.ctrlKey or e.originalEvent.which > 1
 
     @renderedLines.on 'mousedown', onMouseDown