mirror of
https://github.com/anticensority/runet-censorship-bypass.git
synced 2024-11-10 19:46:34 +03:00
0.20, remove navalny and chirch references
This commit is contained in:
Ilya Ig. Petrov
parent
879667e704
commit
16d8e959f1
|
|
@ -56,7 +56,7 @@ gulp.task('clean', function() {
|
|||
});
|
||||
|
||||
const fullContext = {
|
||||
version: '0.19',
|
||||
version: '0.20',
|
||||
nameSuffixEn: '',
|
||||
nameSuffixRu: '',
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@
|
|||
pacUrls: ['https://antizapret.prostovpn.org/proxy.pac'],
|
||||
},
|
||||
Антицензорити: {
|
||||
label: 'Антицензорити (тормозит)',
|
||||
label: 'Антицензорити (<a href="https://github.com/anticensorship-russia/chromium-extension/issues/6" style="color: red">тормозит</a>)',
|
||||
desc: 'Основной PAC-скрипт от автора расширения.' +
|
||||
' Блокировка определятся по доменному имени или IP адресу.' +
|
||||
' Работает на switch-ах. <br/>' +
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 @@
|
|||
<ul id="pac-mods">
|
||||
<li class="control-row hor-flex">
|
||||
<input type="button" value="Применить" id="apply-mods" disabled/>
|
||||
<a href id="reset-mods" class="link-button">К изначальным!</a>
|
||||
<a href id="reset-mods">К изначальным!</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
|
@ -447,13 +447,13 @@
|
|||
<div class="hor-padded">
|
||||
<section class="hor-flex" id="status-row">
|
||||
<div id="status" style="will-change: contents">Загрузка...</div>
|
||||
<a class="only-for-mini-version other-version link-button" title="Полная версия" href="https://rebrand.ly/ac-versions">🏋︎</a>
|
||||
<a class="only-for-full-version other-version link-button" title="Версия для слабых машин" href="https://rebrand.ly/ac-versions">🐌︎</a>
|
||||
<a class="only-for-mini-version other-version" title="Полная версия" href="https://rebrand.ly/ac-versions">🏋︎</a>
|
||||
<a class="only-for-full-version other-version" title="Версия для слабых машин" href="https://rebrand.ly/ac-versions">🐌︎</a>
|
||||
</section>
|
||||
|
||||
<footer class="control-row hor-flex">
|
||||
<input type="button" value="Готово" class="close-button">
|
||||
<a href="../troubleshoot/index.html" class="link-button">
|
||||
<a href="../troubleshoot/index.html">
|
||||
Проблемы?
|
||||
</a>
|
||||
</footer>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ chrome.runtime.getBackgroundPage( (backgroundPage) =>
|
|||
|
||||
const setStatusTo = (msg) => {
|
||||
|
||||
getStatus().innerHTML = msg || 'Поддержи <a href="https://2018.navalny.com" class="link-button">Навального</a> и <a href="https://fbk.info" class="link-button">ФБК</a>!';
|
||||
getStatus().innerHTML = msg || 'Хорошего настроения Вам!';
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -595,12 +595,12 @@ HTTPS 11.22.33.44:8080;">${conf.value || localStorage.getItem(uiRaw) || ''}</tex
|
|||
|
||||
document.getElementById('reset-mods').onclick = () => {
|
||||
|
||||
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();
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
]
|
||||
},
|
||||
"browser_action": {
|
||||
"default_title": "Этот сайт одобрен РПЦ | Версия ${version}",
|
||||
"default_title": "Этот сайт благословлён | Версия ${version}",
|
||||
"default_popup": "/pages/choose-pac-provider/index.html"
|
||||
},
|
||||
"options_ui": {
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
]
|
||||
},
|
||||
"browser_action": {
|
||||
"default_title": "Этот сайт одобрен РПЦ | Версия ${version}-mini",
|
||||
"default_title": "Этот сайт благословлён | Версия ${version}-mini",
|
||||
"default_popup": "/pages/choose-pac-provider/index.html"
|
||||
},
|
||||
"options_ui": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user