Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix new hidden setting default value not being applied (https://github.com/orgs/uBlockOrigin/teams/volunteers/discussions/62)

This commit is contained in:
Raymond Hill 2018-04-09 17:46:29 -04:00
parent 251b36338b
commit 00cb02ec47
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/storage.js
View File

@ -104,6 +104,15 @@
µb.hiddenSettings[key] = hs[key];
}
}
// To remove once 1.15.26 is widespread. The reason is to ensure
// the change in the following commit is taken into account:
// https://github.com/gorhill/uBlock/commit/8071321e9104
if ( hs.manualUpdateAssetFetchPeriod === 2000 ) {
µb.hiddenSettings.manualUpdateAssetFetchPeriod =
µb.hiddenSettingsDefault.manualUpdateAssetFetchPeriod;
hs.manualUpdateAssetFetchPeriod = undefined;
µb.saveHiddenSettings();
}
}
if ( vAPI.localStorage.getItem('immediateHiddenSettings') === null ) {
µb.saveImmediateHiddenSettings();
@ -116,8 +125,21 @@
);
};
// Note: Save only the settings which values differ from the default ones.
// This way the new default values in the future will properly apply for those
// which were not modified by the user.
µBlock.saveHiddenSettings = function(callback) {
vAPI.storage.set({ hiddenSettings: this.hiddenSettings, callback });
var bin = { hiddenSettings: {} };
for ( var prop in this.hiddenSettings ) {
if (
this.hiddenSettings.hasOwnProperty(prop) &&
this.hiddenSettings[prop] !== this.hiddenSettingsDefault[prop]
) {
bin.hiddenSettings[prop] = this.hiddenSettings[prop];
}
}
vAPI.storage.set(bin, callback);
this.saveImmediateHiddenSettings();
};