From f50bc509f67e81ff0b521243300e100995a0c216 Mon Sep 17 00:00:00 2001 From: Will Bamberg Date: Thu, 25 Jan 2018 17:10:46 -0800 Subject: [PATCH] Use messaging instead of getBackgroundPage --- user-script/background.js | 7 ++++++- user-script/popup/user-script.js | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/user-script/background.js b/user-script/background.js index 5087f73..3df64c2 100644 --- a/user-script/background.js +++ b/user-script/background.js @@ -2,7 +2,10 @@ var registered = null; -async function register(hosts, code) { +async function registerScript(message) { + + let hosts = message.hosts; + let code = message.code; if (registered) { registered.unregister(); @@ -15,3 +18,5 @@ async function register(hosts, code) { }); } + +browser.runtime.onMessage.addListener(registerScript); diff --git a/user-script/popup/user-script.js b/user-script/popup/user-script.js index d08aca3..8a544ee 100644 --- a/user-script/popup/user-script.js +++ b/user-script/popup/user-script.js @@ -9,9 +9,11 @@ const defaultCode = "document.body.innerHTML = '

This page has been eaten

hostsInput.value = defaultHosts; codeInput.value = defaultCode; -async function registerScript() { - let background = await browser.runtime.getBackgroundPage(); - background.register(hostsInput.value.split(","), codeInput.value) +function registerScript() { + browser.runtime.sendMessage({ + hosts: hostsInput.value.split(","), + code: codeInput.value + }); } document.querySelector("#register").addEventListener('click', registerScript);