From 7be92c43981bf64869f100c6a8b4a60ba0073264 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 3 Feb 2016 15:37:51 +0000
Subject: Prevent nested help dialog iframes

---
 content_scripts/vimium_frontend.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'content_scripts')

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()
-- 
cgit v1.2.3