From b05276ed8264e5a71f20a7068690ba2a414ee6d8 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 7 Mar 2015 16:49:32 +0000
Subject: Reload content scripts after install/update.

This is @mrmr1993's work from #1041.

Reload content scripts when vimium is installed or updates.

(@mrmr1993:  The automatic merge was really messy (or, at least, I
couldn't figure out what was going on).  Since the bulk of #1041 was
actually quite compact, I took the liberty of just copying it in.  Hope
you don't mind.)
---
 background_scripts/main.coffee | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 23950e6e..7b360efd 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -2,6 +2,25 @@ root = exports ? window
 
 currentVersion = Utils.getCurrentVersion()
 
+# Iterate over existing tabs and inject the necessary javascript/css into each.
+injectContentScriptsIntoOpenTabs = ->
+  manifest = chrome.runtime.getManifest()
+  # Content scripts loaded on every page should be in the same group. We assume it is the first.
+  contentScripts = manifest.content_scripts[0]
+  chrome.tabs.query { status: "complete" }, (tabs) ->
+    jobs = [ [ chrome.tabs.executeScript, contentScripts.js ], [ chrome.tabs.insertCSS, contentScripts.css ] ]
+    # Chrome complains if we don't evaluate chrome.runtime.lastError on errors (and we get errors for tabs on
+    # which Vimium cannot run).
+    checkLastRuntimeError = -> chrome.runtime.lastError
+    for tab in tabs
+      for [ func, files ] in jobs
+        for file in files
+          func tab.id, { file: file, allFrames: contentScripts.allFrames }, checkLastRuntimeError
+
+# The browser may have tabs already open. We inject the content scripts immediately so that they work straight
+# away.
+chrome.runtime.onInstalled.addListener injectContentScriptsIntoOpenTabs
+
 tabQueue = {} # windowId -> Array
 tabInfoMap = {} # tabId -> object with various tab properties
 keyQueue = "" # Queue of keys typed
-- 
cgit v1.2.3


From d3cd1fd3d0f8b2cc4249ad8fdbd76bbb94a82997 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 8 Mar 2015 10:43:53 +0000
Subject: Reload content scripts: minor refactoring.

---
 background_scripts/main.coffee | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 7b360efd..4ab88019 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -1,26 +1,22 @@
 root = exports ? window
 
-currentVersion = Utils.getCurrentVersion()
-
-# Iterate over existing tabs and inject the necessary javascript/css into each.
-injectContentScriptsIntoOpenTabs = ->
+# The browser may have tabs already open. We inject the content scripts immediately so that they work straight
+# away.
+chrome.runtime.onInstalled.addListener ->
   manifest = chrome.runtime.getManifest()
   # Content scripts loaded on every page should be in the same group. We assume it is the first.
   contentScripts = manifest.content_scripts[0]
+  jobs = [ [ chrome.tabs.executeScript, contentScripts.js ], [ chrome.tabs.insertCSS, contentScripts.css ] ]
+  # Chrome complains if we don't evaluate chrome.runtime.lastError on errors (and we get errors for tabs on
+  # which Vimium cannot run).
+  checkLastRuntimeError = -> chrome.runtime.lastError
   chrome.tabs.query { status: "complete" }, (tabs) ->
-    jobs = [ [ chrome.tabs.executeScript, contentScripts.js ], [ chrome.tabs.insertCSS, contentScripts.css ] ]
-    # Chrome complains if we don't evaluate chrome.runtime.lastError on errors (and we get errors for tabs on
-    # which Vimium cannot run).
-    checkLastRuntimeError = -> chrome.runtime.lastError
     for tab in tabs
       for [ func, files ] in jobs
         for file in files
           func tab.id, { file: file, allFrames: contentScripts.allFrames }, checkLastRuntimeError
 
-# The browser may have tabs already open. We inject the content scripts immediately so that they work straight
-# away.
-chrome.runtime.onInstalled.addListener injectContentScriptsIntoOpenTabs
-
+currentVersion = Utils.getCurrentVersion()
 tabQueue = {} # windowId -> Array
 tabInfoMap = {} # tabId -> object with various tab properties
 keyQueue = "" # Queue of keys typed
-- 
cgit v1.2.3