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(-)

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

for OS X.</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/fork/homebrew/about/'>about</a><a href='/fork/homebrew/'>summary</a><a href='/fork/homebrew/refs/?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>refs</a><a href='/fork/homebrew/log/Library/Formula/uptimed.rb'>log</a><a class='active' href='/fork/homebrew/tree/Library/Formula/uptimed.rb?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>tree</a><a href='/fork/homebrew/commit/Library/Formula/uptimed.rb?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>commit</a><a href='/fork/homebrew/diff/Library/Formula/uptimed.rb?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>diff</a><a href='/fork/homebrew/stats/Library/Formula/uptimed.rb'>stats</a></td><td class='form'><form class='right' method='get' action='/fork/homebrew/log/Library/Formula/uptimed.rb'>
<input type='hidden' name='id' value='beff883f14df93d8635577d00fdd1be4dcbd4450'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/fork/homebrew/tree/?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>root</a>/<a href='/fork/homebrew/tree/Library?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>Library</a>/<a href='/fork/homebrew/tree/Library/Formula?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>Formula</a>/<a href='/fork/homebrew/tree/Library/Formula/uptimed.rb?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>uptimed.rb</a></div><div class='content'>blob: 7bb38ea445abc12b1c92370d6c38672c5776ebc9 (<a href='/fork/homebrew/plain/Library/Formula/uptimed.rb?id=beff883f14df93d8635577d00fdd1be4dcbd4450'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
</pre></td>
<td class='lines'><pre><code>