From f26a17b4f84847d2efffa9b741ba81e4afa9cd4b Mon Sep 17 00:00:00 2001 From: wanhose Date: Tue, 17 May 2022 17:02:47 +0200 Subject: [PATCH 1/5] fix(browser-extension): popup enables icon --- packages/browser-extension/src/scripts/popup.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/browser-extension/src/scripts/popup.js b/packages/browser-extension/src/scripts/popup.js index 76e7dc8..0e2db4f 100644 --- a/packages/browser-extension/src/scripts/popup.js +++ b/packages/browser-extension/src/scripts/popup.js @@ -44,9 +44,6 @@ const handlePowerChange = () => { state: { enabled: !enabled }, type: 'UPDATE_CACHE', }); - dispatch({ - type: !enabled === true ? 'ENABLE_ICON' : 'DISABLE_ICON', - }); if (!enabled === false) power.removeAttribute('checked'); if (!enabled === true) power.setAttribute('checked', 'checked'); chrome.tabs.reload(id, { bypassCache: true }); From 5f3d346eb8439bef9bf82f621526f2c5c8be21f1 Mon Sep 17 00:00:00 2001 From: wanhose Date: Tue, 17 May 2022 17:03:46 +0200 Subject: [PATCH 2/5] chore(browser-extension): disable minify inlines fonts --- packages/browser-extension/.minify.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/browser-extension/.minify.json diff --git a/packages/browser-extension/.minify.json b/packages/browser-extension/.minify.json new file mode 100644 index 0000000..07cfca1 --- /dev/null +++ b/packages/browser-extension/.minify.json @@ -0,0 +1,5 @@ +{ + "img": { + "maxSize": 0 + } +} From b1b9b092b27b99b7f06e3b2a7a22c6aa19bcd355 Mon Sep 17 00:00:00 2001 From: wanhose Date: Tue, 17 May 2022 17:04:50 +0200 Subject: [PATCH 3/5] fix(browser-extension): background and content minor bugs --- packages/browser-extension/src/scripts/background.js | 6 +++--- packages/browser-extension/src/scripts/content.js | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/browser-extension/src/scripts/background.js b/packages/browser-extension/src/scripts/background.js index 3a17da3..8a7cba7 100644 --- a/packages/browser-extension/src/scripts/background.js +++ b/packages/browser-extension/src/scripts/background.js @@ -93,8 +93,8 @@ const query = async (key, callback) => { const queryTab = (callback) => { chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => { callback({ - id: tabs[0].id, - hostname: new URL(tabs[0].url).hostname, + id: tabs[0]?.id, + hostname: new URL(tabs[0].url).hostname.split('.').slice(-2).join('.'), }); }); }; @@ -112,7 +112,7 @@ const report = () => { if (tab) { fetch(`${apiUrl}/report/`, { body: JSON.stringify({ - text: `There's a problem with ${tab.url} using ${userAgent} in CDM ${version}`, + html: `Browser: ${userAgent}
Site: ${tab.url}
Version: ${version}`, to: 'wanhose.development@gmail.com', subject: 'Cookie Dialog Monster Report', }), diff --git a/packages/browser-extension/src/scripts/content.js b/packages/browser-extension/src/scripts/content.js index a039754..5d13144 100644 --- a/packages/browser-extension/src/scripts/content.js +++ b/packages/browser-extension/src/scripts/content.js @@ -78,7 +78,9 @@ const check = (node) => const clean = (nodes) => { if (selectors.length) { - nodes.filter(check).forEach((node) => (node.outerHTML = '')); + nodes.filter(check).forEach((node) => { + if (node.parentElement) node.outerHTML = ''; + }); } }; From fbfc76eb3dd3297c2433768b0f035d36017590aa Mon Sep 17 00:00:00 2001 From: wanhose Date: Tue, 17 May 2022 17:05:05 +0200 Subject: [PATCH 4/5] chore(browser-extension): upgrade version --- packages/browser-extension/src/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/browser-extension/src/manifest.json b/packages/browser-extension/src/manifest.json index 9854c31..77a5feb 100644 --- a/packages/browser-extension/src/manifest.json +++ b/packages/browser-extension/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Cookie Dialog Monster", - "version": "5.5.1", + "version": "5.5.2", "default_locale": "en", "description": "__MSG_appDesc__", "icons": { From e5285cb88546c35c4624eba33375324765497069 Mon Sep 17 00:00:00 2001 From: wanhose Date: Tue, 17 May 2022 17:28:40 +0200 Subject: [PATCH 5/5] feat(browser-extension): add attributes to mutation observer --- .../browser-extension/src/scripts/content.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/browser-extension/src/scripts/content.js b/packages/browser-extension/src/scripts/content.js index 5d13144..f54d039 100644 --- a/packages/browser-extension/src/scripts/content.js +++ b/packages/browser-extension/src/scripts/content.js @@ -40,9 +40,10 @@ const preview = hostname.startsWith('consent.') || hostname.startsWith('myprivac /** * @description Options provided to observer + * @type {MutationObserverInit} */ -const options = { childList: true, subtree: true }; +const options = { attributes: true, childList: true, subtree: true }; /** * @description Selectors list @@ -76,13 +77,7 @@ const check = (node) => * @returns {void} */ -const clean = (nodes) => { - if (selectors.length) { - nodes.filter(check).forEach((node) => { - if (node.parentElement) node.outerHTML = ''; - }); - } -}; +const clean = (nodes) => nodes.filter(check).forEach((node) => (node.outerHTML = '')); /** * @description Fixes scroll issues @@ -139,7 +134,7 @@ const observer = new MutationObserver((mutations, instance) => { instance.disconnect(); fix(); - if (!preview) clean(nodes); + if (!preview && selectors.length) clean(nodes); instance.observe(target, options); }); @@ -163,8 +158,8 @@ const promiseAll = () => document.addEventListener('readystatechange', () => { dispatch({ hostname, type: 'GET_CACHE' }, null, async ({ enabled }) => { - if (document.readyState === 'complete' && enabled && !preview && selectors.length) { - const nodes = Array.from(document.querySelectorAll(selectors)); + if (document.readyState === 'complete' && enabled && !preview) { + const nodes = selectors.length ? Array.from(document.querySelectorAll(selectors)) : []; fix(); clean(nodes);