From 15eafe6f3c6140424c1744f81eed419c8672d682 Mon Sep 17 00:00:00 2001 From: daniel-j Date: Fri, 10 Dec 2021 13:22:33 +0100 Subject: [PATCH] manifest-v3 --- extension/manifest.json | 18 +++++++++++------- src/eventPage.js | 8 ++++++-- src/main.js | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/extension/manifest.json b/extension/manifest.json index b2c2051..ba2bdf2 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -1,5 +1,5 @@ { - "manifest_version": 2, + "manifest_version": 3, "name": "fimfic2epub", "short_name": "fimfic2epub", @@ -11,8 +11,7 @@ }, "background": { - "scripts": ["build/eventPage.js"], - "persistent": false + "service_worker": "build/eventPage.js" }, "content_scripts": [ @@ -23,20 +22,25 @@ } ], - "page_action": { + "action": { "default_icon": "fimfic2epub-logo.png" }, "web_accessible_resources": [ - "fimfic2epub-logo.png" + { + "resources": ["fimfic2epub-logo.png"], + "matches": ["https://www.fimfiction.net/*"] + } ], "permissions": [ + "storage" + ], + "host_permissions": [ "https://fimfiction.net/*", "https://*.fimfiction.net/*", "https://www.googleapis.com/*", "https://i.ytimg.com/*", - "https://twemoji.maxcdn.com/*", - "storage" + "https://twemoji.maxcdn.com/*" ] } diff --git a/src/eventPage.js b/src/eventPage.js index d18d44c..d525e8c 100644 --- a/src/eventPage.js +++ b/src/eventPage.js @@ -15,6 +15,10 @@ if (typeof safari !== 'undefined') { }) }, false) } else { + chrome.runtime.onInstalled.addListener(() => { + chrome.action.disable() + }) + const onMessage = chrome.extension.onMessage ? chrome.extension.onMessage : chrome.runtime.onMessage onMessage.addListener(function (request, sender, sendResponse) { @@ -28,11 +32,11 @@ if (typeof safari !== 'undefined') { // required for async return true } else if (request.showPageAction) { - chrome.pageAction.show(sender.tab.id) + chrome.action.enable(sender.tab.id) } }) - chrome.pageAction.onClicked.addListener(function (tab) { + chrome.action.onClicked.addListener(function (tab) { chrome.tabs.sendMessage(tab.id, 'pageAction') }) } diff --git a/src/main.js b/src/main.js index 767b624..3530b0d 100644 --- a/src/main.js +++ b/src/main.js @@ -37,7 +37,7 @@ try { pageStoryId = document.location.pathname.match(/^\/story\/(\d*)/)[1] } catch (e) {} -const logoUrl = chrome.extension.getURL('fimfic2epub-logo.png') +const logoUrl = chrome.runtime.getURL('fimfic2epub-logo.png') let ffc const stories = document.querySelectorAll('.story_container')