aboutsummaryrefslogtreecommitdiffstats
path: root/background_scripts/commands.coffee
diff options
context:
space:
mode:
authorStephen Blott2014-12-29 17:28:37 +0000
committerStephen Blott2014-12-29 17:28:37 +0000
commitf7541ed966859ae893600f5cfd17a1965efd0822 (patch)
tree386ac078c3d08c2dba9c6b0a11b49cf0063ed382 /background_scripts/commands.coffee
parent6c1bbf0ab5781951364464c5fa68ad22f74c9fee (diff)
parent7499675455941251eaa69c93e7c66bfb1c6ae35c (diff)
downloadvimium-f7541ed966859ae893600f5cfd17a1965efd0822.tar.bz2
Merge branch 'smblott-uicomponent-iframe' into post-1.46-with-uicomponent-iframe
Conflicts: content_scripts/vimium_frontend.coffee manifest.json
Diffstat (limited to 'background_scripts/commands.coffee')
-rw-r--r--background_scripts/commands.coffee3
1 files changed, 3 insertions, 0 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index 585ef572..63b870cc 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -91,6 +91,7 @@ Commands =
commandGroups:
pageNavigation:
["scrollDown",
+ "activateTestUIComponent",
"scrollUp",
"scrollLeft",
"scrollRight",
@@ -252,6 +253,7 @@ defaultKeyMappings =
"m": "Marks.activateCreateMode"
"`": "Marks.activateGotoMode"
+ "D": "activateTestUIComponent"
# This is a mapping of: commandIdentifier => [description, options].
@@ -263,6 +265,7 @@ commandDescriptions =
scrollUp: ["Scroll up"]
scrollLeft: ["Scroll left"]
scrollRight: ["Scroll right"]
+ activateTestUIComponent: ["UI component test"]
scrollToTop: ["Scroll to the top of the page", { noRepeat: true }]
scrollToBottom: ["Scroll to the bottom of the page", { noRepeat: true }]