1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-04 16:47:15 +02:00

Fine tune data reported in Support pane

Related commit:
- a3a43c7cb4
This commit is contained in:
Raymond Hill 2021-10-13 08:31:04 -04:00
parent 6836809aad
commit e7444883a3
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
4 changed files with 28 additions and 18 deletions

View File

@ -1,3 +1,7 @@
body {
margin-bottom: 6rem;
}
.cm-string.cm-property {
color: black;
}

View File

@ -114,6 +114,24 @@ const userSettingsDefault = {
webrtcIPAddressHidden: false,
};
const dynamicFilteringDefault = [
'behind-the-scene * * noop',
'behind-the-scene * image noop',
'behind-the-scene * 3p noop',
'behind-the-scene * inline-script noop',
'behind-the-scene * 1p-script noop',
'behind-the-scene * 3p-script noop',
'behind-the-scene * 3p-frame noop',
];
const hostnameSwitchesDefault = [
'no-large-media: behind-the-scene false',
];
// https://github.com/LiCybora/NanoDefenderFirefox/issues/196
if ( vAPI.webextFlavor.soup.has('firefox') ) {
hostnameSwitchesDefault.push('no-csp-reports: * true');
}
const µBlock = { // jshint ignore:line
userSettingsDefault: userSettingsDefault,
userSettings: Object.assign({}, userSettingsDefault),
@ -122,18 +140,8 @@ const µBlock = { // jshint ignore:line
hiddenSettingsAdmin: {},
hiddenSettings: Object.assign({}, hiddenSettingsDefault),
dynamicFilteringDefault: [
'behind-the-scene * * noop',
'behind-the-scene * image noop',
'behind-the-scene * 3p noop',
'behind-the-scene * inline-script noop',
'behind-the-scene * 1p-script noop',
'behind-the-scene * 3p-script noop',
'behind-the-scene * 3p-frame noop',
],
hostnameSwitchesDefault: [
'no-large-media: behind-the-scene false',
],
dynamicFilteringDefault,
hostnameSwitchesDefault,
noDashboard: false,

View File

@ -1304,7 +1304,9 @@ const getSupportData = async function() {
return {
browserFlavor: Array.from(vAPI.webextFlavor.soup).join(' '),
browserVersion: vAPI.webextFlavor.major,
extensionId: vAPI.i18n('@@extension_id'),
extensionId: vAPI.webextFlavor.soup.has('firefox') === false
? vAPI.i18n('@@extension_id')
: undefined,
extensionName: vAPI.app.name,
extensionVersion: vAPI.app.version,
modifiedUserSettings,

View File

@ -363,10 +363,6 @@ const createDefaultProps = function() {
'netWhitelist': µb.netWhitelistDefault,
'version': '0.0.0.0'
};
// https://github.com/LiCybora/NanoDefenderFirefox/issues/196
if ( vAPI.webextFlavor.soup.has('firefox') ) {
fetchableProps.hostnameSwitchesString += '\nno-csp-reports: * true';
}
toFetch(µb.localSettings, fetchableProps);
toFetch(µb.restoreBackupSettings, fetchableProps);
return fetchableProps;
@ -380,7 +376,7 @@ try {
ubolog(`Admin settings ready ${Date.now()-vAPI.T0} ms after launch`);
await µb.loadHiddenSettings();
onHiddenSettingsReady();
await onHiddenSettingsReady();
ubolog(`Hidden settings ready ${Date.now()-vAPI.T0} ms after launch`);
const adminExtra = await vAPI.adminStorage.get('toAdd');