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

Fix legacy storage stuff

This commit is contained in:
Chris 2015-04-30 13:58:50 -06:00
parent 7a8612bfec
commit e0d938b26c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/messaging.js
View File

@ -1075,7 +1075,7 @@ var backupUserData = function(callback) {
µb.restoreBackupSettings.lastBackupFile = filename; µb.restoreBackupSettings.lastBackupFile = filename;
µb.restoreBackupSettings.lastBackupTime = Date.now(); µb.restoreBackupSettings.lastBackupTime = Date.now();
µb.keyvalSetMany(µb.restoreBackupSettings); vAPI.storage.set(µb.restoreBackupSettings);
getLocalData(callback); getLocalData(callback);
}; };
@ -1105,7 +1105,7 @@ var restoreUserData = function(request) {
// Be sure to adjust `countdown` if adding/removing anything below // Be sure to adjust `countdown` if adding/removing anything below
µb.keyvalSetOne('version', userData.version); µb.keyvalSetOne('version', userData.version);
µBlock.saveLocalSettings(true); µBlock.saveLocalSettings(true);
µb.keyvalSetMany(userData.userSettings, onCountdown); vAPI.storage.set(userData.userSettings, onCountdown);
µb.keyvalSetOne('remoteBlacklists', userData.filterLists, onCountdown); µb.keyvalSetOne('remoteBlacklists', userData.filterLists, onCountdown);
µb.keyvalSetOne('netWhitelist', userData.netWhitelist || '', onCountdown); µb.keyvalSetOne('netWhitelist', userData.netWhitelist || '', onCountdown);
@ -1115,7 +1115,7 @@ var restoreUserData = function(request) {
µb.keyvalSetOne('dynamicFilteringString', s, onCountdown); µb.keyvalSetOne('dynamicFilteringString', s, onCountdown);
µb.assets.put('assets/user/filters.txt', userData.userFilters, onCountdown); µb.assets.put('assets/user/filters.txt', userData.userFilters, onCountdown);
µb.keyvalSetMany({ vAPI.storage.set({
lastRestoreFile: request.file || '', lastRestoreFile: request.file || '',
lastRestoreTime: Date.now(), lastRestoreTime: Date.now(),
lastBackupFile: '', lastBackupFile: '',