From 4117c5030b3b101d977078125e9c075c43c83949 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 22 Nov 2017 18:29:13 +0000
Subject: FF: Reattach expando on every message to Frame

This fixes #2830: it stops timesofindia.indiatimes.com from failing due
to FF bug 1408996.
---
 content_scripts/vimium_frontend.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index fa973e43..83dfcc97 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -221,6 +221,7 @@ Frame =
     @port = chrome.runtime.connect name: "frames"
 
     @port.onMessage.addListener (request) =>
+      root.extend window, root unless extend?
       (@listeners[request.handler] ? this[request.handler]) request
 
     # We disable the content scripts when we lose contact with the background page, or on unload.
-- 
cgit v1.2.3


From e46f88ced3575ca8045dfeae2cecc4755a902e23 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 22 Nov 2017 18:44:33 +0000
Subject: Add a comment for Frame expando fix

---
 content_scripts/vimium_frontend.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 83dfcc97..432fa7a2 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -221,7 +221,7 @@ Frame =
     @port = chrome.runtime.connect name: "frames"
 
     @port.onMessage.addListener (request) =>
-      root.extend window, root unless extend?
+      root.extend window, root unless extend? # See #2800 and #2831.
       (@listeners[request.handler] ? this[request.handler]) request
 
     # We disable the content scripts when we lose contact with the background page, or on unload.
-- 
cgit v1.2.3