From 645c86288652bbe001be49d54131a3f0c992368d Mon Sep 17 00:00:00 2001 From: gorhill Date: Tue, 25 Jul 2017 09:16:48 -0400 Subject: [PATCH] always set browserAction title --- platform/chromium/vapi-background.js | 13 ++++++++----- src/js/tab.js | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index 2c4ca6715..e6b58751b 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -614,7 +614,8 @@ vAPI.tabs.injectScript = function(tabId, details, callback) { // Firefox for Android does no support browser.browserAction.setIcon(). vAPI.setIcon = (function() { - var titleTemplate = chrome.runtime.getManifest().name + ' ({badge})'; + var browserAction = chrome.browserAction, + titleTemplate = chrome.runtime.getManifest().name + ' ({badge})'; var iconPaths = [ { '19': 'img/browsericons/icon19-off.png', @@ -630,8 +631,8 @@ vAPI.setIcon = (function() { tabId = toChromiumTabId(tabId); if ( tabId === 0 ) { return; } - if ( chrome.browserAction.setIcon !== undefined ) { - chrome.browserAction.setIcon( + if ( browserAction.setIcon !== undefined ) { + browserAction.setIcon( { tabId: tabId, path: iconPaths[iconStatus === 'on' ? 1 : 0] @@ -650,8 +651,10 @@ vAPI.setIcon = (function() { } } ); - } else if ( chrome.browserAction.setTitle !== undefined ) { - chrome.browserAction.setTitle({ + } + + if ( browserAction.setTitle !== undefined ) { + browserAction.setTitle({ tabId: tabId, title: titleTemplate.replace( '{badge}', diff --git a/src/js/tab.js b/src/js/tab.js index 1454cc16d..7c1f04e82 100644 --- a/src/js/tab.js +++ b/src/js/tab.js @@ -903,7 +903,7 @@ vAPI.tabs.registerListeners(); if ( vAPI.isBehindTheSceneTabId(tabId) ) { return; } - tabIdToTimer[tabId] = vAPI.setTimeout(updateBadge.bind(this, tabId), 666); + tabIdToTimer[tabId] = vAPI.setTimeout(updateBadge.bind(this, tabId), 701); }; })();