diff options
| author | Stephen Blott | 2016-04-17 16:22:28 +0100 |
|---|---|---|
| committer | Stephen Blott | 2016-04-17 16:22:28 +0100 |
| commit | 44ddab1e1eca01ae6c958756d149be2d4128b290 (patch) | |
| tree | be4e76270a1b0fdffc58c1a706cc4983e57b23d9 /content_scripts/vomnibar.coffee | |
| parent | 27385e81debd5fcd9000c718d73e296d6723e83a (diff) | |
| parent | 4b564e8517dd3415cb8e2209ce019fa024e88770 (diff) | |
| download | vimium-44ddab1e1eca01ae6c958756d149be2d4128b290.tar.bz2 | |
Merge pull request #2101 from smblott-github/rework-help-dialog
Move help dialog to top frame
Diffstat (limited to 'content_scripts/vomnibar.coffee')
| -rw-r--r-- | content_scripts/vomnibar.coffee | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee index 02ce97c5..cbd2892c 100644 --- a/content_scripts/vomnibar.coffee +++ b/content_scripts/vomnibar.coffee @@ -48,8 +48,7 @@ Vomnibar = } init: -> - unless @vomnibarUI? - @vomnibarUI = new UIComponent "pages/vomnibar.html", "vomnibarFrame", -> + @vomnibarUI ?= new UIComponent "pages/vomnibar.html", "vomnibarFrame", -> # This function opens the vomnibar. It accepts options, a map with the values: # completer - The completer to fetch results from. @@ -58,8 +57,9 @@ Vomnibar = # newTab - Optional, boolean. Whether to open the result in a new tab. open: (sourceFrameId, options) -> @init() - if @vomnibarUI?.uiComponentIsReady - @vomnibarUI.activate extend options, { name: "activate", sourceFrameId, focus: true } + # The Vomnibar cannot coexist with the help dialog (it causes focus issues). + HelpDialog.abort() + @vomnibarUI.activate extend options, { name: "activate", sourceFrameId, focus: true } root = exports ? window root.Vomnibar = Vomnibar |