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 2017-11-12 08:31:56 +05:00
commit 029f80633d
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js
View File

@ -533,17 +533,23 @@
}); });
console.log('Updating from', oldStorage.version, 'to', antiCensorRu.version); console.log('Updating from', oldStorage.version, 'to', antiCensorRu.version);
try {
if (window.apis.version.isLeq(oldStorage.version, '0.0.1.5')) { if (window.apis.version.isLeq(oldStorage.version, '0.0.1.5')) {
// Change semicolons to semicolons followed by newlines in proxy string (raw). // Change semicolons to semicolons followed by newlines in proxy string (raw).
const migrateProxies = (oldStr) => oldStr.replace(/;\\r?\\n?/g, ';\\n'); const migrateProxies = (oldStr) => oldStr.replace(/;\\r?\\n?/g, ';\\n');
const modsMutated = window.apis.pacKitchen.getPacModsRaw(); const modsMutated = window.apis.pacKitchen.getPacModsRaw();
if (modsMutated) {
modsMutated['customProxyStringRaw'] = migrateProxies(modsMutated['customProxyStringRaw']); modsMutated['customProxyStringRaw'] = migrateProxies(modsMutated['customProxyStringRaw']);
await new Promise( await new Promise(
(resolve) => window.apis.pacKitchen.keepCookedNowAsync(modsMutated, resolve), (resolve) => window.apis.pacKitchen.keepCookedNowAsync(modsMutated, resolve),
); );
}
} }
} catch (e) {
// Swallow update error.
}
ifUpdatedCb(); ifUpdatedCb();
}); });

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

@ -12,7 +12,7 @@ const pacUrls = [
]; ];
const commonContext = { const commonContext = {
version: '1.6', version: '1.10',
anticensorityPacUrls: [ anticensorityPacUrls: [
...pacUrls, ...pacUrls,
], ],