anticensority/runet-censorship-bypass
1
1
Fork 0
mirror of https://github.com/anticensority/runet-censorship-bypass.git synced 2025-07-16 11:12:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

update button added

Browse Source
This commit is contained in:
Ilya Ig. Petrov 2016-01-26 15:38:40 +05:00
parent 97669e886d
commit 9420177df2
4 changed files with 83 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/chromium/minimalistic-pac-setter/extnesion/manifest.json
View File

@ -25,6 +25,6 @@
}, },
"options_ui": { "options_ui": {
"page": "/pages/choose-pac-provider/index.html", "page": "/pages/choose-pac-provider/index.html",
"chrome_style": false "chrome_style": true
} }
} }

29
extensions/chromium/minimalistic-pac-setter/extnesion/pages/choose-pac-provider/index.html
View File

@ -7,21 +7,48 @@
list-style-type: none; list-style-type: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-bottom: 1em;
} }
li { li {
display: block; display: block;
white-space: nowrap; white-space: nowrap;
} }
li > * {
vertical-align: middle;
}
input[type="radio"], label {
cursor: pointer;
}
.off { .off {
display: none; display: none;
} }
.link-button, .link-button:visited {
color: #0000EE;
text-decoration: none;
display: none;
}
.link-button:hover {
text-decoration: underline;
}
input:checked ~ .link-button {
display: inline;
}
.button-panel {
margin-top: 1em;
}
</style> </style>
</head> </head>
<body> <body>
<ul id="list-of-providers"> <ul id="list-of-providers">
<li><input type="radio" name="pacProvider" id="none" checked> <label for="none">Отключить</label></li> <li><input type="radio" name="pacProvider" id="none" checked> <label for="none">Отключить</label></li>
</ul> </ul>
<div id='status'>Загрузка...</div> <div style="white-space: nowrap">
Обновлялись: <span class="update-date">...</span>
</div>
<div id="status">Загрузка...</div>
<div class="button-panel">
<input type="button" value="Готово" class="close-button">
</div>
<script src="./index.js"></script> <script src="./index.js"></script>
</body> </body>
</html> </html>

58
extensions/chromium/minimalistic-pac-setter/extnesion/pages/choose-pac-provider/index.js
View File

@ -11,20 +11,48 @@ chrome.runtime.getBackgroundPage( backgroundPage => {
var antiCensorRu = backgroundPage.antiCensorRu; var antiCensorRu = backgroundPage.antiCensorRu;
var ul = document.querySelector('#list-of-providers'); // DATE
var _firstChild = ul.firstChild;
for( var providerKey of Object.keys(antiCensorRu.pacProviders) ) { var dateForUser = 'неизвестно';
var li = document.createElement('li'); if( antiCensorRu.lastPacUpdateStamp ) {
li.innerHTML = '<input type="radio" name="pacProvider" id="'+providerKey+'"> <label for="'+providerKey+'">'+providerKey+'</label>'; var diff = Date.now() - antiCensorRu.lastPacUpdateStamp;
ul.insertBefore( li, _firstChild ); var units = ' мс'
var gauges = [
[1000, ' с'],
[60, ' мин'],
[60, ' ч'],
[24, ' дн'],
[7, ' недель'],
[4, ' месяцев'],
[12, ' г']
];
for(var g of gauges) {
var diffy = Math.floor(diff / g[0]);
if (!diffy)
break;
diff = diffy;
var units = g[1];
}
dateForUser = diff + units + ' назад';
} }
var dateElement = document.querySelector('.update-date');
dateElement.innerText = dateForUser;
dateElement.title = new Date(antiCensorRu.lastPacUpdateStamp).toLocaleString('ru-RU');
// CLOSE
document.querySelector('.close-button').onclick = () => window.close();
// RADIOS
var currentRadio = () => { var currentRadio = () => {
var id = antiCensorRu.currentPacProviderKey || 'none'; var id = antiCensorRu.currentPacProviderKey || 'none';
return document.querySelector('#'+id); return document.querySelector('#'+id);
} }
var checkChosenProvider = () => { var checkChosenProvider = () => {
currentRadio().checked = true; var radio = currentRadio();
radio.checked = true;
} }
var triggerChosenProvider = () => { var triggerChosenProvider = () => {
var event = document.createEvent('HTMLEvents'); var event = document.createEvent('HTMLEvents');
@ -32,15 +60,25 @@ chrome.runtime.getBackgroundPage( backgroundPage => {
currentRadio().dispatchEvent(event); currentRadio().dispatchEvent(event);
} }
var ul = document.querySelector('#list-of-providers');
var _firstChild = ul.firstChild;
for( var providerKey of Object.keys(antiCensorRu.pacProviders) ) {
var li = document.createElement('li');
li.innerHTML = '<input type="radio" name="pacProvider" id="'+providerKey+'"> <label for="'+providerKey+'">'+providerKey+'</label> <a href class="link-button">[обновить]</a>';
li.querySelector('.link-button').onclick = () => {triggerChosenProvider(); return false;};
ul.insertBefore( li, _firstChild );
}
var radios = [].slice.apply( document.querySelectorAll('[name=pacProvider]') ); var radios = [].slice.apply( document.querySelectorAll('[name=pacProvider]') );
for(var radio of radios) { for(var radio of radios) {
radio.onchange = function(event) { radio.onchange = function(event) {
var pacKey = event.target.id; var pacKey = event.target.id;
if (pacKey === 'none') if (pacKey === 'none')
return antiCensorRu.clearPac( () => window && window.close() ); return antiCensorRu.clearPac();
function enableDisableInputs() { function enableDisableInputs() {
var inputs = document.querySelectorAll('[name="pacProvider"]'); var inputs = document.querySelectorAll('input');
console.log(inputs.length);
for (var i = 0; i < inputs.length; i++) for (var i = 0; i < inputs.length; i++)
inputs[i].disabled = !inputs[i].disabled; inputs[i].disabled = !inputs[i].disabled;
} }
@ -49,7 +87,7 @@ chrome.runtime.getBackgroundPage( backgroundPage => {
setStatusTo('Установка...'); setStatusTo('Установка...');
antiCensorRu.installPac(pacKey, () => { antiCensorRu.installPac(pacKey, () => {
setStatusTo('PAC-скрипт установлен.'); setStatusTo('PAC-скрипт установлен.');
if(window) window.close(); enableDisableInputs();
}); });
} }
} }

8
extensions/chromium/minimalistic-pac-setter/extnesion/sync-pac-script-with-pac-provider.js
View File

@ -73,10 +73,14 @@ window.antiCensorRu = {
}); });
}, },
lastPacUpdateStamp: 0,
syncWithPacProvider(cb) { syncWithPacProvider(cb) {
setPacScriptFromProvider( setPacScriptFromProvider(
this.pacProvider, this.pacProvider,
() => { err => {
if (!err)
this.lastPacUpdateStamp = Date.now();
updatePacProxyIps( updatePacProxyIps(
this.pacProvider, this.pacProvider,
() => { () => {
@ -155,7 +159,7 @@ window.antiCensorRu.pullFromStorage( () => {
chrome.alarms.onAlarm.addListener( chrome.alarms.onAlarm.addListener(
alarm => { alarm => {
if (alarm.name === window.antiCensorRu._periodicUpdateAlarmReason) { if (alarm.name === window.antiCensorRu._periodicUpdateAlarmReason) {
console.log('Periodic update triggered.'); console.log('Periodic update triggered:', new Date());
window.antiCensorRu.syncWithPacProvider(); window.antiCensorRu.syncWithPacProvider();
} }
} }