aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts
diff options
context:
space:
mode:
authorStephen Blott2014-12-24 05:44:56 +0000
committerStephen Blott2014-12-24 05:44:56 +0000
commit17b621240aaafd9b8863c5b15b7a2e26c5d0c105 (patch)
treee3fd5099786ed09c63f29911f6f6d8112256ec5e /content_scripts
parent99d784ff593378be41b5e6eb87867826fee9e921 (diff)
parent25473c3dea3d847d36bda9c56a190dd3b0e5a43f (diff)
downloadvimium-17b621240aaafd9b8863c5b15b7a2e26c5d0c105.tar.bz2
Merge remote-tracking branch 'upstream/master' into post-1.46
Diffstat (limited to 'content_scripts')
-rw-r--r--content_scripts/vimium_frontend.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 071e87a6..2de08c39 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -205,7 +205,7 @@ initializeOnDomReady = ->
registerFrame = ->
# Don't register frameset containers; focusing them is no use.
- if document.body.tagName.toLowerCase() != "frameset"
+ unless document.body?.tagName.toLowerCase() == "frameset"
chrome.runtime.sendMessage
handler: "registerFrame"
frameId: frameId