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 /content_scripts | |
| 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
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/vomnibar.coffee | 2 |
1 files changed, 2 insertions, 0 deletions
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 |