|
|
@ -219,10 +219,6 @@
|
|
|
|
µm.ubiquitousBlacklist.reset();
|
|
|
|
µm.ubiquitousBlacklist.reset();
|
|
|
|
var locations = Object.keys(hostsFiles);
|
|
|
|
var locations = Object.keys(hostsFiles);
|
|
|
|
hostsFileLoadCount = locations.length;
|
|
|
|
hostsFileLoadCount = locations.length;
|
|
|
|
if ( hostsFileLoadCount === 0 ) {
|
|
|
|
|
|
|
|
loadHostsFilesEnd();
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Load all hosts file which are not disabled.
|
|
|
|
// Load all hosts file which are not disabled.
|
|
|
|
var location;
|
|
|
|
var location;
|
|
|
@ -233,6 +229,12 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
µm.assets.get(location, mergeHostsFile);
|
|
|
|
µm.assets.get(location, mergeHostsFile);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// https://github.com/gorhill/uMatrix/issues/2
|
|
|
|
|
|
|
|
if ( hostsFileLoadCount === 0 ) {
|
|
|
|
|
|
|
|
loadHostsFilesEnd();
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
this.getAvailableHostsFiles(loadHostsFilesStart);
|
|
|
|
this.getAvailableHostsFiles(loadHostsFilesStart);
|
|
|
|