From 4de8e668be6ff09637fbaa5e2eff2825e13f1fd6 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 23 Nov 2014 16:36:56 +0000
Subject: Frames; more cleanup and simplification.

---
 content_scripts/vimium_frontend.coffee | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 62b1132b..0c88be84 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -185,19 +185,18 @@ initializeOnDomReady = ->
   chrome.runtime.connect({ name: "domReady" })
 
 registerFrame = ->
-  chrome.runtime.sendMessage(
-    handler: "registerFrame"
-    frameId: frameId
-    is_top: window.top == window.self
-    is_frameset: document.body.tagName == "FRAMESET")
+  # Don't register frameset containers; focusing them is no use.
+  if document.body.tagName != "FRAMESET"
+    chrome.runtime.sendMessage
+      handler: "registerFrame"
+      frameId: frameId
 
 # Unregister the frame if we're going to exit.
 unregisterFrame = ->
-  chrome.runtime.sendMessage(
+  chrome.runtime.sendMessage
     handler: "unregisterFrame"
     frameId: frameId
-    is_top: window.top == window.self
-    is_frameset: document.body.tagName == "FRAMESET")
+    tab_is_closing: window.top == window.self
 
 #
 # Enters insert mode if the currently focused element in the DOM is focusable.
@@ -1062,8 +1061,8 @@ Tween =
 
 initializePreDomReady()
 window.addEventListener("DOMContentLoaded", registerFrame)
-window.addEventListener("DOMContentLoaded", initializeOnDomReady)
 window.addEventListener("unload", unregisterFrame)
+window.addEventListener("DOMContentLoaded", initializeOnDomReady)
 
 window.onbeforeunload = ->
   chrome.runtime.sendMessage(
-- 
cgit v1.2.3