mirror of
https://github.com/anticensority/runet-censorship-bypass.git
synced 2024-11-10 19:46:34 +03:00
Merge branch 'development' into production
This commit is contained in:
commit
5ed0ced254
|
@ -1 +1 @@
|
|||
grep -r $@ ./src --exclude-dir=vendor --exclude-dir=node_modules --exclude-dir=dist
|
||||
grep -r "$@" ./src --exclude-dir=vendor --exclude-dir=node_modules --exclude-dir=dist
|
||||
|
|
|
@ -284,7 +284,7 @@
|
|||
|
||||
chrome.proxy.settings.onChange.addListener( timeouted( (details) => {
|
||||
|
||||
console.log('Proxy settings changed.', details);
|
||||
console.log('Proxy settings changed:', details.levelOfControl);
|
||||
const noCon = 'no-control';
|
||||
const ifWasControllable = handlers.ifControllable;
|
||||
if ( !handlers.isControllable(details) && ifWasControllable ) {
|
||||
|
|
|
@ -49,7 +49,13 @@ chrome.runtime.getBackgroundPage( (bgWindow) =>
|
|||
);
|
||||
// READY TO RENDER
|
||||
|
||||
document.documentElement.style.display = 'initial';
|
||||
const show = () => { document.documentElement.style.display = 'initial'; };
|
||||
|
||||
if (theState.flags.ifInsideOptionsPage) {
|
||||
show();
|
||||
} else {
|
||||
setTimeout(show, 200); // Mac bug: https://bugs.chromium.org/p/chromium/issues/detail?id=428044
|
||||
}
|
||||
|
||||
}
|
||||
)
|
||||
|
|
|
@ -75,8 +75,11 @@
|
|||
Encoded to counter abuse. */
|
||||
host: '\x70\x72\x6f\x78\x79\x2e\x61\x6e\x74\x69\x7a\x61\x70\x72\x65\x74\x2e\x70\x72\x6f\x73\x74\x6f\x76\x70\x6e\x2e\x6f\x72\x67',
|
||||
};
|
||||
const proxyForRanges =
|
||||
'\x63\x63\x61\x68\x69\x68\x61\x2e\x61\x6e\x74\x69\x7a\x61\x70\x72\x65\x74\x2e\x70\x72\x6f\x73\x74\x6f\x76\x70\x6e\x2e\x6f\x72\x67';
|
||||
privates._strToHostObj = {
|
||||
[_antizapret.host]: _antizapret,
|
||||
[proxyForRanges]: { host: proxyForRanges },
|
||||
};
|
||||
|
||||
privates._ipToHostObj = {};
|
||||
|
|
|
@ -12,7 +12,7 @@ const pacUrls = [
|
|||
];
|
||||
|
||||
const commonContext = {
|
||||
version: '1.21',
|
||||
version: '1.23',
|
||||
anticensorityPacUrls: [
|
||||
...pacUrls,
|
||||
],
|
||||
|
@ -57,7 +57,7 @@ exports.contexts.firefox = Object.assign({}, commonContext, {
|
|||
|
||||
exports.contexts.beta = Object.assign({}, commonContext, {
|
||||
anticensorityPacUrls: [
|
||||
// 'https://rebrand.ly/ac-beta-pac',
|
||||
'https://rebrand.ly/ac-beta-pac',
|
||||
...pacUrls,
|
||||
],
|
||||
version: '1.14',
|
||||
|
|
Loading…
Reference in New Issue
Block a user