|
@ -19,7 +19,6 @@ |
|
|
Home: https://github.com/gorhill/uMatrix
|
|
|
Home: https://github.com/gorhill/uMatrix
|
|
|
*/ |
|
|
*/ |
|
|
|
|
|
|
|
|
/* jshint boss: true */ |
|
|
|
|
|
/* global chrome, µMatrix, punycode, publicSuffixList */ |
|
|
/* global chrome, µMatrix, punycode, publicSuffixList */ |
|
|
|
|
|
|
|
|
/******************************************************************************/ |
|
|
/******************************************************************************/ |
|
@ -111,7 +110,7 @@ |
|
|
var oldLocation, newLocation; |
|
|
var oldLocation, newLocation; |
|
|
var availableEntry, storedEntry; |
|
|
var availableEntry, storedEntry; |
|
|
|
|
|
|
|
|
while ( oldLocation = locations.pop() ) { |
|
|
|
|
|
|
|
|
while ( (oldLocation = locations.pop()) ) { |
|
|
newLocation = redirections[oldLocation] || oldLocation; |
|
|
newLocation = redirections[oldLocation] || oldLocation; |
|
|
availableEntry = availableHostsFiles[newLocation]; |
|
|
availableEntry = availableHostsFiles[newLocation]; |
|
|
if ( availableEntry === undefined ) { |
|
|
if ( availableEntry === undefined ) { |
|
@ -119,7 +118,7 @@ |
|
|
} |
|
|
} |
|
|
storedEntry = lists[oldLocation] || {}; |
|
|
storedEntry = lists[oldLocation] || {}; |
|
|
availableEntry.off = storedEntry.off || false; |
|
|
availableEntry.off = storedEntry.off || false; |
|
|
µm.assets.setHomeURL(newLocation, availableEntry.homeURL); |
|
|
|
|
|
|
|
|
µm.assets.setHomeURL(newLocation, availableEntry.homeURL || ''); |
|
|
if ( storedEntry.entryCount !== undefined ) { |
|
|
if ( storedEntry.entryCount !== undefined ) { |
|
|
availableEntry.entryCount = storedEntry.entryCount; |
|
|
availableEntry.entryCount = storedEntry.entryCount; |
|
|
} |
|
|
} |
|
@ -225,7 +224,7 @@ |
|
|
|
|
|
|
|
|
// Load all hosts file which are not disabled.
|
|
|
// Load all hosts file which are not disabled.
|
|
|
var location; |
|
|
var location; |
|
|
while ( location = locations.pop() ) { |
|
|
|
|
|
|
|
|
while ( (location = locations.pop()) ) { |
|
|
if ( hostsFiles[location].off ) { |
|
|
if ( hostsFiles[location].off ) { |
|
|
hostsFileLoadCount -= 1; |
|
|
hostsFileLoadCount -= 1; |
|
|
continue; |
|
|
continue; |
|
|