external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-10 09:07:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Ensure "Ignore generic cosmetic filters" sticks on Fennec

Browse source 
Related issue:
- https://www.reddit.com/r/uBlockOrigin/comments/blkudl/

The setting was not sticking at first-install time.
This commit is contained in:
Raymond Hill 2019-05-11 09:04:13 -04:00
parent 93576c096e
commit 12bdd01595
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/js/background.js
View file

@ -82,7 +82,7 @@ const µBlock = (function() { // jshint ignore:line
externalLists: [],
firewallPaneMinimized: true,
hyperlinkAuditingDisabled: true,
ignoreGenericCosmeticFilters: false,
ignoreGenericCosmeticFilters: vAPI.webextFlavor.soup.has('mobile'),
largeMediaSize: 50,
parseAllABPHideFilters: true,
prefetchingDisabled: true,

13
src/js/start.js
View file

@ -186,11 +186,11 @@ const onVersionReady = function(lastVersion) {
// If unused, just comment out for when we need to compare versions in the
// future.
const intFromVersion = function(s) {
let parts = s.match(/(?:^|\.|b|rc)\d+/g);
const parts = s.match(/(?:^|\.|b|rc)\d+/g);
if ( parts === null ) { return 0; }
let vint = 0;
for ( let i = 0; i < 4; i++ ) {
let pstr = parts[i] || '';
const pstr = parts[i] || '';
let pint;
if ( pstr === '' ) {
pint = 0;
@ -206,7 +206,7 @@ const onVersionReady = function(lastVersion) {
return vint;
};
let lastVersionInt = intFromVersion(lastVersion);
const lastVersionInt = intFromVersion(lastVersion);
if ( lastVersionInt <= 1016021007 ) {
µb.sessionSwitches.toggle('no-scripting', 'behind-the-scene', 2);
@ -262,13 +262,6 @@ const onUserSettingsReady = function(fetched) {
µb.sessionURLFiltering.assign(µb.permanentURLFiltering);
µb.permanentSwitches.fromString(fetched.hostnameSwitchesString);
µb.sessionSwitches.assign(µb.permanentSwitches);
// https://github.com/gorhill/uBlock/issues/1892
// For first installation on a battery-powered device, disable generic
// cosmetic filtering.
if ( µb.firstInstall && vAPI.webextFlavor.soup.has('mobile') ) {
userSettings.ignoreGenericCosmeticFilters = true;
}
};
/******************************************************************************/