diff options
| author | mrmr1993 | 2016-02-03 15:37:51 +0000 |
|---|---|---|
| committer | mrmr1993 | 2016-02-03 15:37:51 +0000 |
| commit | 7be92c43981bf64869f100c6a8b4a60ba0073264 (patch) | |
| tree | 6e30e7a0da2ca1035368d478ca9c827f18d68a4f /content_scripts | |
| parent | acb0c7010d345a3e4918c4aa33eb1d2bf72cf8da (diff) | |
| download | vimium-7be92c43981bf64869f100c6a8b4a60ba0073264.tar.bz2 | |
Prevent nested help dialog iframes
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 93b4bf34..fdfef910 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -219,7 +219,7 @@ initializeOnDomReady = -> # We only initialize the vomnibar in the tab's main frame, because it's only ever opened there. Vomnibar.init() if DomUtils.isTopFrame() HUD.init() - HelpDialog.init() + HelpDialog.init() unless document.location.toString() == chrome.extension.getURL "pages/help_dialog.html" registerFrame = -> # Don't register frameset containers; focusing them is no use. @@ -782,7 +782,7 @@ window.HelpDialog = @helpUI = new UIComponent "pages/help_dialog.html", "vimiumHelpDialogFrame", (event) => @helpUI.hide() if event.data == "hide" - isReady: -> true + isReady: -> @helpUI? show: (html) -> return if HelpDialog.showing or !@isReady() |