aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--background_scripts/commands.coffee7
-rw-r--r--content_scripts/vomnibar.coffee2
2 files changed, 9 insertions, 0 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index ce159c71..22153eda 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -95,6 +95,7 @@ Commands =
"LinkHints.activateMode", "LinkHints.activateModeToOpenInNewTab", "LinkHints.activateModeWithQueue",
"Vomnibar.activate", "Vomnibar.activateInNewTab", "Vomnibar.activateTabSelection",
"Vomnibar.activateBookmarks", "Vomnibar.activateBookmarksInNewTab",
+ "Vomnibar.activateEditUrl", "Vomnibar.activateEditUrlInNewTab",
"goPrevious", "goNext", "nextFrame", "Marks.activateCreateMode", "Marks.activateGotoMode"]
findCommands: ["enterFindMode", "performFind", "performBackwardsFind"]
historyNavigation:
@@ -110,6 +111,7 @@ Commands =
advancedCommands: [
"scrollToLeft", "scrollToRight", "moveTabToNewWindow",
"goUp", "goToRoot", "focusInput", "LinkHints.activateModeWithQueue",
+ "Vomnibar.activateEditUrl", "Vomnibar.activateEditUrlInNewTab",
"LinkHints.activateModeToOpenIncognito", "goNext", "goPrevious", "Marks.activateCreateMode",
"Marks.activateGotoMode"]
@@ -178,6 +180,9 @@ defaultKeyMappings =
"b": "Vomnibar.activateBookmarks"
"B": "Vomnibar.activateBookmarksInNewTab"
+ "ge": "Vomnibar.activateEditUrl"
+ "gE": "Vomnibar.activateEditUrlInNewTab"
+
"gf": "nextFrame"
"m": "Marks.activateCreateMode"
@@ -251,6 +256,8 @@ commandDescriptions =
"Vomnibar.activateTabSelection": ["Search through your open tabs"]
"Vomnibar.activateBookmarks": ["Open a bookmark"]
"Vomnibar.activateBookmarksInNewTab": ["Open a bookmark in a new tab"]
+ "Vomnibar.activateEditUrl": ["Edit the current URL"]
+ "Vomnibar.activateEditUrlInNewTab": ["Edit the current URL and open in a new tab"]
nextFrame: ["Cycle forward to the next frame on the page", { background: true, passCountToFunction: true }]
diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee
index 6782ab28..b0850f8e 100644
--- a/content_scripts/vomnibar.coffee
+++ b/content_scripts/vomnibar.coffee
@@ -28,6 +28,8 @@ Vomnibar =
activateTabSelection: -> @activateWithCompleter("tabs", 0, null, true)
activateBookmarks: -> @activateWithCompleter("bookmarks", 0, null, true)
activateBookmarksInNewTab: -> @activateWithCompleter("bookmarks", 0, null, true, true)
+ activateEditUrl: -> @activateWithCompleter("omni", 100, window.location.href)
+ activateEditUrlInNewTab: -> @activateWithCompleter("omni", 100, window.location.href, false, true)
getUI: -> @vomnibarUI