From e053530dc82cdf202c67483d9148d006daab7979 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Wed, 8 Feb 2017 17:53:47 +0000
Subject: Stop using deprecated key 'selected' of tabs; switch to 'active'

The documentation suggests that 'highlighted' is equivalent to
'selected'. However, multiple tabs can be highlighted in a window -- in
fact, everywhere 'selected' was used, we wanted the unique active tab.
---
 background_scripts/main.coffee  | 6 +++---
 background_scripts/marks.coffee | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index e02cef4d..70739eae 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -99,7 +99,7 @@ TabOperations =
     tabConfig =
       url: Utils.convertToUrl request.url
       index: request.tab.index + 1
-      selected: true
+      active: true
       windowId: request.tab.windowId
       openerTabId: request.tab.id
     chrome.tabs.create tabConfig, callback
@@ -127,7 +127,7 @@ toggleMuteTab = do ->
 selectSpecificTab = (request) ->
   chrome.tabs.get(request.id, (tab) ->
     chrome.windows.update(tab.windowId, { focused: true })
-    chrome.tabs.update(request.id, { selected: true }))
+    chrome.tabs.update(request.id, { active: true }))
 
 moveTab = ({count, tab, registryEntry}) ->
   count = -count if registryEntry.command == "moveTabLeft"
@@ -238,7 +238,7 @@ selectTab = (direction, {count, tab}) ->
             Math.min tabs.length - 1, count - 1
           when "last"
             Math.max 0, tabs.length - count
-      chrome.tabs.update tabs[toSelect].id, selected: true
+      chrome.tabs.update tabs[toSelect].id, active: true
 
 chrome.tabs.onUpdated.addListener (tabId, changeInfo, tab) ->
   return unless changeInfo.status == "loading" # Only do this once per URL change.
diff --git a/background_scripts/marks.coffee b/background_scripts/marks.coffee
index dbc14671..33c467a7 100644
--- a/background_scripts/marks.coffee
+++ b/background_scripts/marks.coffee
@@ -57,7 +57,7 @@ Marks =
 
   # Focus an existing tab and scroll to the given position within it.
   gotoPositionInTab: ({ tabId, scrollX, scrollY, markName }) ->
-    chrome.tabs.update tabId, {selected: true}, ->
+    chrome.tabs.update tabId, { active: true }, ->
       chrome.tabs.sendMessage tabId, {name: "setScrollPosition", scrollX, scrollY}
 
   # The tab we're trying to find no longer exists.  We either find another tab with a matching URL and use it,
-- 
cgit v1.2.3