prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Report cosmetic filters as popup panel property

Browse source
This commit is contained in:
Raymond Hill 2023-04-04 13:20:58 -04:00
parent 8c376d7791
commit 620a96531c
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/js/messaging.js
View file

@ -615,9 +615,6 @@ const onMessage = function(request, sender, callback) {
if ( vAPI.net.hasUnprocessedRequest(request.tabId) ) { if ( vAPI.net.hasUnprocessedRequest(request.tabId) ) {
request.popupPanel.hasUnprocessedRequest = true; request.popupPanel.hasUnprocessedRequest = true;
} }
const supportURL = new URL(vAPI.getURL('support.html'));
supportURL.searchParams.set('pageURL', request.pageURL);
supportURL.searchParams.set('popupPanel', JSON.stringify(request.popupPanel));
vAPI.tabs.executeScript(request.tabId, { vAPI.tabs.executeScript(request.tabId, {
allFrames: true, allFrames: true,
file: '/js/scriptlets/cosmetic-report.js', file: '/js/scriptlets/cosmetic-report.js',
@ -628,8 +625,11 @@ const onMessage = function(request, sender, callback) {
return a; return a;
}, []); }, []);
if ( filters.length !== 0 ) { if ( filters.length !== 0 ) {
supportURL.searchParams.set('cosmetic', JSON.stringify(filters)); request.popupPanel.cosmetic = filters;
} }
const supportURL = new URL(vAPI.getURL('support.html'));
supportURL.searchParams.set('pageURL', request.pageURL);
supportURL.searchParams.set('popupPanel', JSON.stringify(request.popupPanel));
µb.openNewTab({ url: supportURL.href, select: true, index: -1 }); µb.openNewTab({ url: supportURL.href, select: true, index: -1 });
}); });
return; return;

8
src/js/support.js
View file

@ -151,9 +151,6 @@ function showData() {
} }
if ( reportedPage !== null ) { if ( reportedPage !== null ) {
shownData.popupPanel = reportedPage.popupPanel; shownData.popupPanel = reportedPage.popupPanel;
if ( reportedPage.cosmeticFilters ) {
shownData.cosmeticFilters = reportedPage.cosmeticFilters;
}
} }
const text = JSON.stringify(shownData, null, 2) const text = JSON.stringify(shownData, null, 2)
.split('\n') .split('\n')
@ -200,14 +197,9 @@ const reportedPage = (( ) => {
select.append(option); select.append(option);
} }
dom.cl.add(dom.body, 'filterIssue'); dom.cl.add(dom.body, 'filterIssue');
let cosmeticFilters;
if ( url.searchParams.has('cosmetic') ) {
cosmeticFilters = JSON.parse(url.searchParams.get('cosmetic'));
}
return { return {
hostname: parsedURL.hostname.replace(/^(m|mobile|www)\./, ''), hostname: parsedURL.hostname.replace(/^(m|mobile|www)\./, ''),
popupPanel: JSON.parse(url.searchParams.get('popupPanel')), popupPanel: JSON.parse(url.searchParams.get('popupPanel')),
cosmeticFilters,
}; };
} catch(ex) { } catch(ex) {
} }