anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2024-11-24 02:13:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into production

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2018-05-05 11:18:31 +05:00
commit 5ed0ced254
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/chromium/runet-censorship-bypass/grep.sh
View File

@ -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

2
extensions/chromium/runet-censorship-bypass/src/extension-common/11-error-handlers-api.js
View File

@ -284,7 +284,7 @@
chrome.proxy.settings.onChange.addListener( timeouted( (details) => { 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 noCon = 'no-control';
const ifWasControllable = handlers.ifControllable; const ifWasControllable = handlers.ifControllable;
if ( !handlers.isControllable(details) && ifWasControllable ) { if ( !handlers.isControllable(details) && ifWasControllable ) {

8
extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
View File

@ -49,7 +49,13 @@ chrome.runtime.getBackgroundPage( (bgWindow) =>
); );
// READY TO RENDER // 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
}
} }
) )

3
extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js
View File

@ -75,8 +75,11 @@
Encoded to counter abuse. */ 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', 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 = { privates._strToHostObj = {
[_antizapret.host]: _antizapret, [_antizapret.host]: _antizapret,
[proxyForRanges]: { host: proxyForRanges },
}; };
privates._ipToHostObj = {}; privates._ipToHostObj = {};

4
extensions/chromium/runet-censorship-bypass/src/templates-data.js
View File

@ -12,7 +12,7 @@ const pacUrls = [
]; ];
const commonContext = { const commonContext = {
version: '1.21', version: '1.23',
anticensorityPacUrls: [ anticensorityPacUrls: [
...pacUrls, ...pacUrls,
], ],
@ -57,7 +57,7 @@ exports.contexts.firefox = Object.assign({}, commonContext, {
exports.contexts.beta = Object.assign({}, commonContext, { exports.contexts.beta = Object.assign({}, commonContext, {
anticensorityPacUrls: [ anticensorityPacUrls: [
// 'https://rebrand.ly/ac-beta-pac', 'https://rebrand.ly/ac-beta-pac',
...pacUrls, ...pacUrls,
], ],
version: '1.14', version: '1.14',