Bug 1384964 - Fix pageAction.show/hide/getPopup/setPopup on Android for tabId 0. draft
authorLuca Greco <lgreco@mozilla.com>
Thu, 27 Jul 2017 18:23:16 +0200
changeset 616886 2abb3460de09a29f4e06ffb024990f6d9d976918
parent 616724 658cba6a971257e2ba39715ec938256dfc414776
child 617495 d20be74a74a6d305fd9e112663de3d400a6ec9ef
child 617577 525a68c72da2c584664a51dabdd66a0f1336b78f
push id70844
push userluca.greco@alcacoop.it
push dateThu, 27 Jul 2017 16:24:03 +0000
bugs1384964
milestone56.0a1
Bug 1384964 - Fix pageAction.show/hide/getPopup/setPopup on Android for tabId 0. MozReview-Commit-ID: FVcbQkiTGqe
mobile/android/components/extensions/ext-pageAction.js
--- a/mobile/android/components/extensions/ext-pageAction.js
+++ b/mobile/android/components/extensions/ext-pageAction.js
@@ -232,32 +232,32 @@ this.pageAction = class extends Extensio
           };
           pageActionMap.get(extension).on("click", listener);
           return () => {
             pageActionMap.get(extension).off("click", listener);
           };
         }).api(),
 
         show(tabId) {
-          let tab = tabId ? tabTracker.getTab(tabId) : null;
+          let tab = tabTracker.getTab(tabId);
           return pageActionMap.get(extension).setProperty(tab, "show", true);
         },
 
         hide(tabId) {
-          let tab = tabId ? tabTracker.getTab(tabId) : null;
+          let tab = tabTracker.getTab(tabId);
           pageActionMap.get(extension).setProperty(tab, "show", false);
         },
 
         setPopup(details) {
-          let tab = details.tabId ? tabTracker.getTab(details.tabId) : null;
+          let tab = tabTracker.getTab(details.tabId);
           let url = details.popup && context.uri.resolve(details.popup);
           pageActionMap.get(extension).setProperty(tab, "popup", url);
         },
 
         getPopup(details) {
-          let tab = details.tabId ? tabTracker.getTab(details.tabId) : null;
+          let tab = tabTracker.getTab(details.tabId);
           let popup = pageActionMap.get(extension).getProperty(tab, "popup");
           return Promise.resolve(popup);
         },
       },
     };
   }
 };