aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts
diff options
context:
space:
mode:
authormrmr19932014-11-23 12:45:11 +0000
committermrmr19932014-11-23 12:45:11 +0000
commit3863e724241408338c9c69af72117584c1258d34 (patch)
treed5b3bf01915d775065640902f8405ae8b32df55c /content_scripts
parente7d3f29cb5e3bdcf55ab18c127564ebfbb4d5259 (diff)
downloadvimium-3863e724241408338c9c69af72117584c1258d34.tar.bz2
Don't record frameIds for frames only containing a frameset
Frameset frames have no content of their own -- they only embed other pages in sub-frames. The user can't perform any actions (of ours or the browsers) with a frameset focused, so we might as well just not focus it.
Diffstat (limited to 'content_scripts')
-rw-r--r--content_scripts/vimium_frontend.coffee6
1 files changed, 4 insertions, 2 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index fd31cc62..62b1132b 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -188,14 +188,16 @@ registerFrame = ->
chrome.runtime.sendMessage(
handler: "registerFrame"
frameId: frameId
- is_top: window.top == window.self)
+ is_top: window.top == window.self
+ is_frameset: document.body.tagName == "FRAMESET")
# Unregister the frame if we're going to exit.
unregisterFrame = ->
chrome.runtime.sendMessage(
handler: "unregisterFrame"
frameId: frameId
- is_top: window.top == window.self)
+ is_top: window.top == window.self
+ is_frameset: document.body.tagName == "FRAMESET")
#
# Enters insert mode if the currently focused element in the DOM is focusable.