Merge pull request #1 from dotproto/pr-608

Migrate to Scripting API

Author: rebloor

beastify/README.md

@@ -25,7 +25,7 @@ Note that:
 
 * if the user reloads the tab, or switches tabs, while the popup is open, then the popup won't be able to beastify the page any more (because the content script was injected into the original tab).
 
-* by default [`tabs.executeScript()`](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/tabs/executeScript) injects the script only when the web page and its resources have finished loading. This means that clicks in the popup will have no effect until the page has finished loading.
+* by default [`scripting.executeScript()`](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/scripting/executeScript) injects the script only when the web page and its resources have finished loading. This means that clicks in the popup will have no effect until the page has finished loading.
 
 * it's not possible to inject content scripts into certain pages, including privileged browser pages like "about:debugging" and the [addons.mozilla.org](https://addons.mozilla.org/) website. If the user clicks the beastify icon when such a page is loaded into the active tab, the popup displays an error message.
 
@@ -34,7 +34,7 @@ Note that:
 * write a browser action with a popup
 * how to have different browser_action images based upon the theme
 * give the popup style and behavior using CSS and JS
-* inject a content script programmatically using `tabs.executeScript()`
+* inject a content script programmatically using `scripting.executeScript()`
 * send a message from the main extension to a content script
 * use web accessible resources to enable web pages to load packaged content
 * reload web pages

beastify/popup/choose_beast.js

@@ -12,7 +12,6 @@ const hidePage = `body > :not(.beastify-image) {
  */
 function listenForClicks() {
   document.addEventListener("click", (e) => {
-
     /**
      * Given the name of a beast, get the URL to the corresponding image.
      */
@@ -33,25 +32,37 @@ function listenForClicks() {
      * send a "beastify" message to the content script in the active tab.
      */
     function beastify(tabs) {
-      browser.scripting.insertCSS({code: hidePage}).then(() => {
-        const url = beastNameToURL(e.target.textContent);
-        browser.tabs.sendMessage(tabs[0].id, {
-          command: "beastify",
-          beastURL: url
+      const tabId = tabs[0].id;
+      browser.scripting
+        .insertCSS({
+          target: { tabId },
+          css: hidePage,
+        })
+        .then(() => {
+          const url = beastNameToURL(e.target.textContent);
+          browser.tabs.sendMessage(tabId, {
+            command: "beastify",
+            beastURL: url,
+          });
         });
-      });
     }
 
     /**
      * Remove the page-hiding CSS from the active tab,
      * send a "reset" message to the content script in the active tab.
      */
     function reset(tabs) {
-      browser.scripting.removeCSS({code: hidePage}).then(() => {
-        browser.tabs.sendMessage(tabs[0].id, {
-          command: "reset",
+      const tabId = tabs[0].id;
+      browser.scripting
+        .removeCSS({
+          target: { tabId },
+          css: hidePage,
+        })
+        .then(() => {
+          browser.tabs.sendMessage(tabId, {
+            command: "reset",
+          });
         });
-      });
     }
 
     /**
@@ -68,13 +79,15 @@ function listenForClicks() {
     if (e.target.tagName !== "BUTTON" || !e.target.closest("#popup-content")) {
       // Ignore when click is not on a button within <div id="popup-content">.
       return;
-    } 
+    }
     if (e.target.type === "reset") {
-      browser.tabs.query({active: true, currentWindow: true})
+      browser.tabs
+        .query({ active: true, currentWindow: true })
         .then(reset)
         .catch(reportError);
     } else {
-      browser.tabs.query({active: true, currentWindow: true})
+      browser.tabs
+        .query({ active: true, currentWindow: true })
         .then(beastify)
         .catch(reportError);
     }
@@ -96,6 +109,13 @@ function reportExecuteScriptError(error) {
  * and add a click handler.
  * If we couldn't inject the script, handle the error.
  */
-browser.tabs.executeScript({file: "/content_scripts/beastify.js"})
-.then(listenForClicks)
-.catch(reportExecuteScriptError);
+browser.tabs
+  .query({ active: true, currentWindow: true })
+  .then(([tab]) =>
+    browser.scripting.executeScript({
+      target: { tabId: tab.id },
+      files: ["/content_scripts/beastify.js"],
+    })
+  )
+  .then(listenForClicks)
+  .catch(reportExecuteScriptError);