diff --git a/extensions/chromium/runet-censorship-bypass/gulpfile.js b/extensions/chromium/runet-censorship-bypass/gulpfile.js index 98b6a4e..9f4b6d2 100644 --- a/extensions/chromium/runet-censorship-bypass/gulpfile.js +++ b/extensions/chromium/runet-censorship-bypass/gulpfile.js @@ -56,7 +56,7 @@ gulp.task('clean', function() { }); const fullContext = { - version: '0.19', + version: '0.20', nameSuffixEn: '', nameSuffixRu: '', }; diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/15-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/15-pac-kitchen-api.js index f565649..2ee9081 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/15-pac-kitchen-api.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/15-pac-kitchen-api.js @@ -298,7 +298,7 @@ console.log('Keep cooked now...', pacMods); if (typeof(pacMods) === 'function') { cb = pacMods; - pacMods = this.getCurrentConfigs(); + pacMods = getCurrentConfigs(); } else { try { pacMods = new PacModifiers(pacMods); @@ -331,11 +331,9 @@ resetToDefaults() { - // Pruge all but exceptions. - const exceptions = kitchenState(modsKey).exceptions; kitchenState(modsKey, null); kitchenState(ifIncontinence, null); - this.keepCookedNowAsync({exceptions: exceptions}); + this.keepCookedNowAsync(throwIfError); }, diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/17-sync-pac-script-with-pac-provider-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/17-sync-pac-script-with-pac-provider-api.js index 1a58192..ba25def 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/17-sync-pac-script-with-pac-provider-api.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/17-sync-pac-script-with-pac-provider-api.js @@ -175,7 +175,7 @@ pacUrls: ['https://antizapret.prostovpn.org/proxy.pac'], }, Антицензорити: { - label: 'Антицензорити (тормозит)', + label: 'Антицензорити (тормозит)', desc: 'Основной PAC-скрипт от автора расширения.' + ' Блокировка определятся по доменному имени или IP адресу.' + ' Работает на switch-ах.
' + @@ -187,7 +187,9 @@ Version: 0.17 */ pacUrls: [ - // Official, Cloud Flare with caching: + // First official, shortened: + 'https://rebrand.ly/ac-chrome-anticensority-pac', + // Second official, Cloud Flare with caching: 'https://anticensorship-russia.tk/generated-pac-scripts/anticensority.pac', // GitHub.io: '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x73\x68\x69\x70\x2d\x72\x75\x73\x73\x69\x61\x2e\x67\x69\x74\x68\x75\x62\x2e\x69\x6f\x2f\x67\x65\x6e\x65\x72\x61\x74\x65\x64\x2d\x70\x61\x63\x2d\x73\x63\x72\x69\x70\x74\x73\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2e\x70\x61\x63', // eslint-disable-line max-len diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html index d8bc524..de3c557 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.html @@ -12,6 +12,13 @@ body { margin: 0; } + a, a:visited { + color: var(--ribbon-color); + text-decoration: none; + } + a:hover { + text-decoration: underline; + } label { user-select: none; } @@ -195,14 +202,6 @@ /* COMMON 2 */ - .link-button, .link-button:visited { - color: #0000EE; - text-decoration: none; - } - .link-button:hover { - text-decoration: underline; - } - /* INFO SIGNS */ .info-row { @@ -367,6 +366,7 @@ .other-version { font-size: 1.7em; color: var(--ribbon-color); + margin-left: 0.1em; } .other-version:hover { text-decoration: none; @@ -428,7 +428,7 @@ @@ -447,13 +447,13 @@
Загрузка...
- 🏋︎ - 🐌︎ + 🏋︎ + 🐌︎
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.js index 1f926b3..e057f6d 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/choose-pac-provider/index.js @@ -17,7 +17,7 @@ chrome.runtime.getBackgroundPage( (backgroundPage) => const setStatusTo = (msg) => { - getStatus().innerHTML = msg || 'Поддержи Навального и ФБК!'; + getStatus().innerHTML = msg || 'Хорошего настроения Вам!'; }; @@ -595,12 +595,12 @@ HTTPS 11.22.33.44:8080;">${conf.value || localStorage.getItem(uiRaw) || ''} { - const ifSure = backgroundPage.confirm('Сбросить все модификации PAC-скрипта?'); + const ifSure = backgroundPage.confirm('Сбросить все модификаторы и ИСКЛЮЧЕНИЯ?'); if (!ifSure) { return false; } pacKitchen.resetToDefaults(); - backgroundPage.apis.ipToHost.resetToDefaults(); + backgroundPage.utils.fireEvent('ip-to-host-reset-to-defaults'); window.close(); }; diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/14-ip-to-host-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-full/14-ip-to-host-api.js index 038c822..3c5df18 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-full/14-ip-to-host-api.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/14-ip-to-host-api.js @@ -337,7 +337,14 @@ }; - window.utils.addEventHandler('ip-to-host-update-all', (...args) => self.updateAllAsync(...args) ); - window.utils.addEventHandler('ip-to-host-replace-all', (...args) => self.replaceAllAsync(...args) ); + window.utils.addEventHandler( + 'ip-to-host-update-all', (...args) => self.updateAllAsync(...args) + ); + window.utils.addEventHandler( + 'ip-to-host-replace-all', (...args) => self.replaceAllAsync(...args) + ); + window.utils.addEventHandler( + 'ip-to-host-reset-to-defaults', () => self.resetToDefaults() + ); } diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/manifest.tmpl.json b/extensions/chromium/runet-censorship-bypass/src/extension-full/manifest.tmpl.json index 1606179..cd0ef34 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-full/manifest.tmpl.json +++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/manifest.tmpl.json @@ -36,7 +36,7 @@ ] }, "browser_action": { - "default_title": "Этот сайт одобрен РПЦ | Версия ${version}", + "default_title": "Этот сайт благословлён | Версия ${version}", "default_popup": "/pages/choose-pac-provider/index.html" }, "options_ui": { diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-mini/manifest.tmpl.json b/extensions/chromium/runet-censorship-bypass/src/extension-mini/manifest.tmpl.json index 718f12b..61f910c 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-mini/manifest.tmpl.json +++ b/extensions/chromium/runet-censorship-bypass/src/extension-mini/manifest.tmpl.json @@ -35,7 +35,7 @@ ] }, "browser_action": { - "default_title": "Этот сайт одобрен РПЦ | Версия ${version}-mini", + "default_title": "Этот сайт благословлён | Версия ${version}-mini", "default_popup": "/pages/choose-pac-provider/index.html" }, "options_ui": {