diff options
| author | Stephen Blott | 2014-12-14 14:17:54 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-14 14:20:54 +0000 |
| commit | 9b8817593af71ddc106c60d44bc967a4bcc553e9 (patch) | |
| tree | e8030195a85189c23dedc3aacb06e3bdc8351460 /content_scripts/vimium_frontend.coffee | |
| parent | 3f3444d1fe72c74439bd9bec3c27ab441ae560a0 (diff) | |
| parent | d42913f75443df565d33ef5c565cd80c31714a60 (diff) | |
| download | vimium-9b8817593af71ddc106c60d44bc967a4bcc553e9.tar.bz2 | |
Merge branch 'vomnibarToPage' of https://github.com/smblott-github/vimium into smblott-github-vomnibarToPage
Conflicts:
background_scripts/main.coffee
content_scripts/vimium.css
content_scripts/vomnibar.coffee
lib/utils.coffee
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 469afe71..b4f0264c 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -123,6 +123,8 @@ initializePreDomReady = -> getActiveState: -> { enabled: isEnabledForUrl, passKeys: passKeys } setState: setState currentKeyQueue: (request) -> keyQueue = request.keyQueue + vomnibarShow: -> Vomnibar.show() + vomnibarClose: -> Vomnibar.close() chrome.runtime.onMessage.addListener (request, sender, sendResponse) -> # In the options page, we will receive requests from both content and background scripts. ignore those |