diff options
| author | Stephen Blott | 2014-10-25 16:40:05 +0100 |
|---|---|---|
| committer | Stephen Blott | 2014-10-25 16:40:05 +0100 |
| commit | a485fe7500ce0d8cad0b6f5a3d20b279d738521b (patch) | |
| tree | 15486a55495479e7a7689d96ef8074f0bf6a4e71 | |
| parent | f5fa44f552a7223e978880b79dba8a1076befab0 (diff) | |
| parent | f86995b7466d4b7c91a8e7a3ceba1c35a2e796e9 (diff) | |
| download | vimium-a485fe7500ce0d8cad0b6f5a3d20b279d738521b.tar.bz2 | |
Merge branch 'feature/edit-url-in-vomnibar' of github.com:sukima/vimium into sukima-feature/edit-url-in-vomnibar
Conflicts:
background_scripts/commands.coffee
| -rw-r--r-- | background_scripts/commands.coffee | 7 | ||||
| -rw-r--r-- | content_scripts/vomnibar.coffee | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index 825160d8..3a85c6fd 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -94,6 +94,7 @@ Commands = "LinkHints.activateModeToOpenInNewForegroundTab", "LinkHints.activateModeWithQueue", "Vomnibar.activate", "Vomnibar.activateInNewTab", "Vomnibar.activateTabSelection", "Vomnibar.activateBookmarks", "Vomnibar.activateBookmarksInNewTab", "goPrevious", "goNext", "nextFrame", "Marks.activateCreateMode", + "Vomnibar.activateEditUrl", "Vomnibar.activateEditUrlInNewTab", "Marks.activateGotoMode"] findCommands: ["enterFindMode", "performFind", "performBackwardsFind"] historyNavigation: @@ -111,6 +112,7 @@ Commands = advancedCommands: [ "scrollToLeft", "scrollToRight", "moveTabToNewWindow", "goUp", "goToRoot", "focusInput", "LinkHints.activateModeWithQueue", "LinkHints.activateModeToDownloadLink", + "Vomnibar.activateEditUrl", "Vomnibar.activateEditUrlInNewTab", "LinkHints.activateModeToOpenIncognito", "goNext", "goPrevious", "Marks.activateCreateMode", "Marks.activateGotoMode", "moveTabLeft", "moveTabRight", "closeTabsOnLeft","closeTabsOnRight", "closeOtherTabs"] @@ -186,6 +188,9 @@ defaultKeyMappings = "b": "Vomnibar.activateBookmarks" "B": "Vomnibar.activateBookmarksInNewTab" + "ge": "Vomnibar.activateEditUrl" + "gE": "Vomnibar.activateEditUrlInNewTab" + "gf": "nextFrame" "m": "Marks.activateCreateMode" @@ -270,6 +275,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 9c13cd6d..22b9ed64 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 |