Compare commits

...

9 Commits

65 changed files with 173 additions and 121 deletions

View File

@ -12,7 +12,8 @@
- [Chrome Web Store](https://chrome.google.com/webstore/detail/djcbfpkdhdkaflcigibkbpboflaplabg) - [Chrome Web Store](https://chrome.google.com/webstore/detail/djcbfpkdhdkaflcigibkbpboflaplabg)
- [Edge Add-ons](https://microsoftedge.microsoft.com/addons/detail/hbogodfciblakeneadpcolhmfckmjcii) - [Edge Add-ons](https://microsoftedge.microsoft.com/addons/detail/hbogodfciblakeneadpcolhmfckmjcii)
- [Mozilla Firefox (.xpi)](https://www.cookie-dialog-monster.com/releases/latest.xpi) - [Mozilla Firefox](https://www.cookie-dialog-monster.com/releases/mozilla/latest.xpi)
- [Mozilla Firefox Mobile](https://www.cookie-dialog-monster.com/releases/mozilla-mobile/latest.xpi)
## Installation ## Installation

View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 3, "manifest_version": 3,
"name": "Cookie Dialog Monster", "name": "Cookie Dialog Monster Mobile",
"version": "8.0.4", "version": "8.0.5",
"default_locale": "en", "default_locale": "en",
"description": "__MSG_appDesc__", "description": "__MSG_appDesc__",
"icons": { "icons": {
@ -12,19 +12,18 @@
"action": { "action": {
"default_icon": "assets/icons/off.png", "default_icon": "assets/icons/off.png",
"default_popup": "popup.html", "default_popup": "popup.html",
"default_title": "Cookie Dialog Monster" "default_title": "Cookie Dialog Monster Mobile"
}, },
"options_page": "options.html", "options_page": "options.html",
"author": "wanhose", "author": "wanhose",
"background": { "background": {
"scripts": ["scripts/background.js"], "scripts": ["scripts/background.js"]
"service_worker": "scripts/background.js"
}, },
"browser_specific_settings": { "browser_specific_settings": {
"gecko": { "gecko": {
"id": "{77e2c00b-e173-4604-863d-01645d8d2826}", "id": "{108d0aea-9bbd-4719-a793-0bc73c1d0064}",
"strict_min_version": "126.0", "strict_min_version": "126.0",
"update_url": "https://www.cookie-dialog-monster.com/mozilla/updates.json" "update_url": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/updates.json"
} }
}, },
"content_scripts": [ "content_scripts": [
@ -36,7 +35,7 @@
} }
], ],
"host_permissions": ["http://*/*", "https://*/*"], "host_permissions": ["http://*/*", "https://*/*"],
"permissions": ["contextMenus", "declarativeNetRequest", "scripting", "storage", "webRequest"], "permissions": ["declarativeNetRequest", "scripting", "storage", "webRequest"],
"web_accessible_resources": [ "web_accessible_resources": [
{ {
"matches": ["http://*/*", "https://*/*"], "matches": ["http://*/*", "https://*/*"],

View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Cookie Dialog Monster > Exclusion List</title> <title>Cookie Dialog Monster Mobile > Exclusion List</title>
<link rel="stylesheet" href="/styles/reset.css" /> <link rel="stylesheet" href="/styles/reset.css" />
<link rel="stylesheet" href="/styles/options.css" /> <link rel="stylesheet" href="/styles/options.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inter" /> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inter" />
@ -13,7 +13,7 @@
<header> <header>
<div> <div>
<h1 class="header-title"> <h1 class="header-title">
Cookie Dialog Monster > <span data-i18n="options_exclusionListTitle"></span> Cookie Dialog Monster Mobile > <span data-i18n="options_exclusionListTitle"></span>
</h1> </h1>
</div> </div>
</header> </header>

View File

@ -10,7 +10,7 @@
</head> </head>
<body> <body>
<header> <header>
<h1 class="header-title">Cookie Dialog Monster</h1> <h1 class="header-title">Cookie Dialog Monster Mobile</h1>
<div class="header-actions"> <div class="header-actions">
<button <button
class="header-button" class="header-button"
@ -121,7 +121,7 @@
</svg> </svg>
</a> </a>
</p> </p>
<div class="grid"> <div class="content">
<button class="popup-button" disabled id="power-option"> <button class="popup-button" disabled id="power-option">
<svg <svg
aria-hidden="true" aria-hidden="true"

View File

@ -49,35 +49,11 @@ class RequestManager {
*/ */
const apiUrl = 'https://api.cookie-dialog-monster.com/rest/v6'; const apiUrl = 'https://api.cookie-dialog-monster.com/rest/v6';
/**
* @description Context menu identifier
* @type {string}
*/
const extensionMenuItemId = 'CDM-MENU';
/**
* @description Context menu identifier
* @type {string}
*/
const reportMenuItemId = 'CDM-REPORT';
/** /**
* @description Request manager instance * @description Request manager instance
*/ */
const requestManager = new RequestManager(); const requestManager = new RequestManager();
/**
* @description Context menu identifier
* @type {string}
*/
const settingsMenuItemId = 'CDM-SETTINGS';
/**
* @description A shortcut for browser.scripting
* @type {browser.scripting}
*/
const script = browser.scripting;
/** /**
* @description Default value for extension state * @description Default value for extension state
* @type {ExtensionState} * @type {ExtensionState}
@ -251,22 +227,6 @@ async function updateStore(key, value) {
} }
} }
/**
* @description Listen to context menus clicked
*/
browser.contextMenus.onClicked.addListener((info) => {
switch (info.menuItemId) {
case reportMenuItemId:
browser.action.openPopup();
break;
case settingsMenuItemId:
browser.runtime.openOptionsPage();
break;
default:
break;
}
});
/** /**
* @description Listens to messages * @description Listens to messages
*/ */
@ -334,38 +294,6 @@ browser.runtime.onMessage.addListener((message, sender, callback) => {
* @description Listens to extension installed * @description Listens to extension installed
*/ */
browser.runtime.onInstalled.addListener((details) => { browser.runtime.onInstalled.addListener((details) => {
const documentUrlPatterns = browser.runtime.getManifest().content_scripts[0].matches;
browser.contextMenus.create(
{
contexts: ['all'],
documentUrlPatterns,
id: extensionMenuItemId,
title: 'Cookie Dialog Monster',
},
suppressLastError
);
browser.contextMenus.create(
{
contexts: ['all'],
documentUrlPatterns,
id: settingsMenuItemId,
parentId: extensionMenuItemId,
title: browser.i18n.getMessage('contextMenu_settingsOption'),
},
suppressLastError
);
browser.contextMenus.create(
{
contexts: ['all'],
documentUrlPatterns,
id: reportMenuItemId,
parentId: extensionMenuItemId,
title: browser.i18n.getMessage('contextMenu_reportOption'),
},
suppressLastError
);
if (details.reason === 'update') { if (details.reason === 'update') {
refreshData(); refreshData();
} }

View File

@ -124,7 +124,7 @@ async function handleContentLoaded() {
const { exclusions } = (await dispatch({ hostname, type: 'GET_DATA' })) ?? {}; const { exclusions } = (await dispatch({ hostname, type: 'GET_DATA' })) ?? {};
const currentVersion = browser.runtime.getManifest().version; const currentVersion = browser.runtime.getManifest().version;
const latestVersion = await dispatch({ type: 'GET_LATEST_VERSION' }); const latestVersion = await dispatch({ type: 'GET_LATEST_VERSION' });
const updateAvailable = currentVersion !== latestVersion; const updateAvailable = latestVersion && currentVersion !== latestVersion;
if (updateAvailable) { if (updateAvailable) {
const updateBanner = document.getElementById('update-banner'); const updateBanner = document.getElementById('update-banner');

View File

@ -96,7 +96,7 @@ header {
} }
} }
.grid { .content {
display: grid; display: grid;
grid-template-columns: repeat(2, 1fr); grid-template-columns: repeat(2, 1fr);
gap: 16px; gap: 16px;

View File

@ -492,7 +492,7 @@
</a> </a>
<a <a
class="bg-gradient-to-r button from-firefox-1 md:hover:animate-gradient to-firefox-3 via-firefox-2" class="bg-gradient-to-r button from-firefox-1 md:hover:animate-gradient to-firefox-3 via-firefox-2"
href="/releases/latest.xpi" href="/releases/mozilla/latest.xpi"
id="firefox-link" id="firefox-link"
target="_blank" target="_blank"
> >
@ -514,7 +514,7 @@
</a> </a>
<a <a
class="bg-gradient-to-r button from-yellow-400 via-brown-500 to-yellow-600 md:hover:animate-gradient" class="bg-gradient-to-r button from-yellow-400 via-brown-500 to-yellow-600 md:hover:animate-gradient"
href="/releases/latest.zip" href="/releases/chromium/latest.zip"
target="_blank" target="_blank"
> >
<span aria-hidden="true" class="icon" role="img">📦</span> <span aria-hidden="true" class="icon" role="img">📦</span>
@ -589,7 +589,7 @@
if (isMobile) { if (isMobile) {
firefoxGuideLink.href = firefoxGuideLink.href =
'https://git.wanhose.dev/wanhose/cookie-dialog-monster/wiki/Step-by-step+installation+guide+for+Mozilla+Firefox+Mobile.-'; 'https://git.wanhose.dev/wanhose/cookie-dialog-monster/wiki/Step-by-step+installation+guide+for+Mozilla+Firefox+Mobile.-';
firefoxLink.href = '/releases/latest-mozilla-mobile.xpi'; firefoxLink.href = '/releases/mozilla-mobile/latest.xpi';
} }
}); });
</script> </script>

View File

@ -4,39 +4,43 @@
"updates": [ "updates": [
{ {
"version": "7.2.2", "version": "7.2.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.2-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.2.xpi"
}, },
{ {
"version": "7.2.3", "version": "7.2.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.3-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.3.xpi"
}, },
{ {
"version": "7.2.4", "version": "7.2.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.4-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.4.xpi"
}, },
{ {
"version": "7.3.0", "version": "7.3.0",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.3.0-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.0.xpi"
}, },
{ {
"version": "7.3.1", "version": "7.3.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.3.1-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.1.xpi"
}, },
{ {
"version": "7.3.2", "version": "7.3.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.3.2-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.2.xpi"
}, },
{ {
"version": "8.0.1", "version": "8.0.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.1-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.1.xpi"
}, },
{ {
"version": "8.0.2", "version": "8.0.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.2-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.2.xpi"
}, },
{ {
"version": "8.0.3", "version": "8.0.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.3-mozilla-mobile.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.3.xpi"
},
{
"version": "8.0.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.4.xpi"
} }
] ]
} }

View File

@ -4,75 +4,71 @@
"updates": [ "updates": [
{ {
"version": "7.0.4", "version": "7.0.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.0.4.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.0.4.xpi"
}, },
{ {
"version": "7.1.0", "version": "7.1.0",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.1.0.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.0.xpi"
}, },
{ {
"version": "7.1.1", "version": "7.1.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.1.1.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.1.xpi"
}, },
{ {
"version": "7.1.2", "version": "7.1.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.1.2.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.2.xpi"
}, },
{ {
"version": "7.1.3", "version": "7.1.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.1.3.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.3.xpi"
}, },
{ {
"version": "7.1.4", "version": "7.1.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.1.4.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.4.xpi"
}, },
{ {
"version": "7.1.5", "version": "7.1.5",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.1.5.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.5.xpi"
}, },
{ {
"version": "7.2.1", "version": "7.2.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.1.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.1.xpi"
}, },
{ {
"version": "7.2.2", "version": "7.2.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.2.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.2.xpi"
}, },
{ {
"version": "7.2.3", "version": "7.2.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.3.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.3.xpi"
}, },
{ {
"version": "7.2.4", "version": "7.2.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.2.4.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.4.xpi"
}, },
{ {
"version": "7.3.0", "version": "7.3.0",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.3.0.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.0.xpi"
}, },
{ {
"version": "7.3.1", "version": "7.3.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.3.1.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.1.xpi"
}, },
{ {
"version": "7.3.2", "version": "7.3.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/7.3.2.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.2.xpi"
}, },
{ {
"version": "8.0.1", "version": "8.0.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.1.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.1.xpi"
}, },
{ {
"version": "8.0.2", "version": "8.0.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.2.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.2.xpi"
}, },
{ {
"version": "8.0.3", "version": "8.0.5",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.3.xpi" "update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.5.xpi"
},
{
"version": "8.0.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/8.0.4.xpi"
} }
] ]
} }

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,48 @@
{
"addons": {
"{108d0aea-9bbd-4719-a793-0bc73c1d0064}": {
"updates": [
{
"version": "7.2.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.2.xpi"
},
{
"version": "7.2.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.3.xpi"
},
{
"version": "7.2.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.2.4.xpi"
},
{
"version": "7.3.0",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.0.xpi"
},
{
"version": "7.3.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.1.xpi"
},
{
"version": "7.3.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/7.3.2.xpi"
},
{
"version": "8.0.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.1.xpi"
},
{
"version": "8.0.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.2.xpi"
},
{
"version": "8.0.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.3.xpi"
},
{
"version": "8.0.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla-mobile/8.0.4.xpi"
}
]
}
}
}

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,76 @@
{
"addons": {
"{77e2c00b-e173-4604-863d-01645d8d2826}": {
"updates": [
{
"version": "7.0.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.0.4.xpi"
},
{
"version": "7.1.0",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.0.xpi"
},
{
"version": "7.1.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.1.xpi"
},
{
"version": "7.1.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.2.xpi"
},
{
"version": "7.1.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.3.xpi"
},
{
"version": "7.1.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.4.xpi"
},
{
"version": "7.1.5",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.1.5.xpi"
},
{
"version": "7.2.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.1.xpi"
},
{
"version": "7.2.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.2.xpi"
},
{
"version": "7.2.3",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.3.xpi"
},
{
"version": "7.2.4",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.2.4.xpi"
},
{
"version": "7.3.0",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.0.xpi"
},
{
"version": "7.3.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.1.xpi"
},
{
"version": "7.3.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/7.3.2.xpi"
},
{
"version": "8.0.1",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.1.xpi"
},
{
"version": "8.0.2",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.2.xpi"
},
{
"version": "8.0.5",
"update_link": "https://www.cookie-dialog-monster.com/releases/mozilla/8.0.5.xpi"
}
]
}
}
}