Merge remote-tracking branch 'mrmr1993/openLinkInFGTab'

Conflicts:
	content_scripts/link_hints.coffee

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/dom_utils.coffee b/lib/dom_utils.coffee
index 70e52a6c..dcdd5518 100644
--- a/lib/dom_utils.coffee
+++ b/lib/dom_utils.coffee
@@ -109,8 +109,8 @@ DomUtils =
     eventSequence = ["mouseover", "mousedown", "mouseup", "click"]
     for event in eventSequence
       mouseEvent = document.createEvent("MouseEvents")
-      mouseEvent.initMouseEvent(event, true, true, window, 1, 0, 0, 0, 0, modifiers.ctrlKey, false, false,
-          modifiers.metaKey, 0, null)
+      mouseEvent.initMouseEvent(event, true, true, window, 1, 0, 0, 0, 0, modifiers.ctrlKey, modifiers.altKey,
+      modifiers.shiftKey, modifiers.metaKey, 0, null)
       # Debugging note: Firefox will not execute the element's default action if we dispatch this click event,
       # but Webkit will. Dispatching a click on an input box does not seem to focus it; we do that separately
       element.dispatchEvent(mouseEvent)
diff --git a/lib/keyboard_utils.coffee b/lib/keyboard_utils.coffee
index df5bbbad..d2a843f9 100644
--- a/lib/keyboard_utils.coffee
+++ b/lib/keyboard_utils.coffee
@@ -1,6 +1,7 @@
 KeyboardUtils =
   keyCodes:
-    { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, shiftKey: 16, f1: 112, f12: 123, tab: 9 }
+    { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, shiftKey: 16, ctrlKey: 17, f1: 112,
+    f12: 123, tab: 9 }
 
   keyNames:
     { 37: "left", 38: "up", 39: "right", 40: "down" }