prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

for unlikely case where two lists are merged into one

Browse source
This commit is contained in:
gorhill 2015-04-18 00:43:32 -04:00
parent d6608e8cf9
commit 6b32efb67b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/js/storage.js
View file

@ -214,20 +214,25 @@
var lists = store.remoteBlacklists; var lists = store.remoteBlacklists;
var locations = Object.keys(lists); var locations = Object.keys(lists);
var location, availableEntry, storedEntry; var location, availableEntry, storedEntry;
var off;
while ( location = locations.pop() ) { while ( location = locations.pop() ) {
storedEntry = lists[location]; storedEntry = lists[location];
off = storedEntry.off === true;
// New location? // New location?
if ( relocationMap.hasOwnProperty(location) ) { if ( relocationMap.hasOwnProperty(location) ) {
µb.purgeFilterList(location); µb.purgeFilterList(location);
location = relocationMap[location]; location = relocationMap[location];
if ( off && lists.hasOwnProperty(location) ) {
off = lists[location].off === true;
}
} }
availableEntry = availableLists[location]; availableEntry = availableLists[location];
if ( availableEntry === undefined ) { if ( availableEntry === undefined ) {
µb.purgeFilterList(location); µb.purgeFilterList(location);
continue; continue;
} }
availableEntry.off = storedEntry.off || false; availableEntry.off = off;
µb.assets.setHomeURL(location, availableEntry.homeURL); µb.assets.setHomeURL(location, availableEntry.homeURL);
if ( storedEntry.entryCount !== undefined ) { if ( storedEntry.entryCount !== undefined ) {
availableEntry.entryCount = storedEntry.entryCount; availableEntry.entryCount = storedEntry.entryCount;