Fall back to default popup value for extension if tab specific value …

…not available Fixes brave/browser-laptop#10224 Auditors: @jonathansampson
brave · Oct 4, 2017 · 189ac95 · 189ac95
1 parent 567986b
commit 189ac95
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/browser/api/browser-actions.js b/lib/browser/api/browser-actions.js
@@ -13,10 +13,12 @@ const updateBrowserAction = (extensionId, details) => {
 
 const getBrowserAction = (extensionId, details) => {
   if (details.tabId) {
+    // return tab specific values (if there are any)
     if (browserActions[extensionId] && browserActions[extensionId][details.tabId]) {
       return browserActions[extensionId][details.tabId]
     }
   }
+  // return extension-wide details
   return browserActions[extensionId] || {}
 }
 
@@ -62,6 +64,6 @@ module.exports = {
   },
 
   getPopup: (extensionId, details) => {
-    return getBrowserAction(extensionId, details).popup
+    return getBrowserAction(extensionId, details).popup || getBrowserAction(extensionId, {}).popup
   }
 }