mirror of https://github.com/gorhill/uBlock.git
parent
6836809aad
commit
e7444883a3
|
@ -1,3 +1,7 @@
|
|||
body {
|
||||
margin-bottom: 6rem;
|
||||
}
|
||||
|
||||
.cm-string.cm-property {
|
||||
color: black;
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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');
|
||||
|
|
Loading…
Reference in New Issue