From 01e720e10400d208627b593d3d539b87d89902d0 Mon Sep 17 00:00:00 2001
From: gdh1995
Date: Sun, 21 Feb 2016 01:05:47 +0800
Subject: use chrome.windows.onFocusChanged to listen window switching

This fix the problem that `chrome.tabs.onActivated` won't be triggered
when we switch Chrome windows.
---
 background_scripts/bg_utils.coffee | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'background_scripts')

diff --git a/background_scripts/bg_utils.coffee b/background_scripts/bg_utils.coffee
index 96c1282a..6ae1e9cb 100644
--- a/background_scripts/bg_utils.coffee
+++ b/background_scripts/bg_utils.coffee
@@ -18,6 +18,13 @@ class TabRecency
       @deregister removedTabId
       @register addedTabId
 
+    self = @
+    chrome.windows.onFocusChanged.addListener (wnd) ->
+      return if wnd == chrome.windows.WINDOW_ID_NONE
+      chrome.tabs.query {windowId: wnd, active: true}, (tabs) ->
+        self.register tabs[0].id if tabs[0]
+        chrome.runtime.lastError
+
   register: (tabId) ->
     currentTime = new Date()
     # Register tabId if it has been visited for at least @timeDelta ms.  Tabs which are visited only for a
-- 
cgit v1.2.3


From 041b441073be2a554af94b23ea16535391cc1f29 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 20 Feb 2016 17:23:37 +0000
Subject: Tweak #2007.

---
 background_scripts/bg_utils.coffee | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/bg_utils.coffee b/background_scripts/bg_utils.coffee
index 6ae1e9cb..ca042686 100644
--- a/background_scripts/bg_utils.coffee
+++ b/background_scripts/bg_utils.coffee
@@ -18,12 +18,10 @@ class TabRecency
       @deregister removedTabId
       @register addedTabId
 
-    self = @
-    chrome.windows.onFocusChanged.addListener (wnd) ->
-      return if wnd == chrome.windows.WINDOW_ID_NONE
-      chrome.tabs.query {windowId: wnd, active: true}, (tabs) ->
-        self.register tabs[0].id if tabs[0]
-        chrome.runtime.lastError
+    chrome.windows.onFocusChanged.addListener (wnd) =>
+      if wnd != chrome.windows.WINDOW_ID_NONE
+        chrome.tabs.query {windowId: wnd, active: true}, (tabs) =>
+          @register tabs[0].id if tabs[0]
 
   register: (tabId) ->
     currentTime = new Date()
-- 
cgit v1.2.3