From 4dfeaf93eb06343b9f6d914209ee85d9ab72a1d4 Mon Sep 17 00:00:00 2001 From: "Ilya Ig. Petrov" Date: Thu, 17 Nov 2016 10:44:48 -0800 Subject: [PATCH] Replace internal pages with URLs on external --- .../assets-sources.txt | 1 + .../extension/3-context-menus.js | 46 ++----------------- .../extension/pages/is-ip-blocked/index.html | 7 --- .../extension/pages/is-ip-blocked/index.js | 26 ----------- .../extension/pages/other-unblocks/index.html | 10 ---- .../extension/pages/other-unblocks/index.js | 42 ----------------- 6 files changed, 4 insertions(+), 128 deletions(-) create mode 100644 extensions/chromium/minimalistic-pac-setter/assets-sources.txt delete mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html delete mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js delete mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html delete mode 100755 extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js diff --git a/extensions/chromium/minimalistic-pac-setter/assets-sources.txt b/extensions/chromium/minimalistic-pac-setter/assets-sources.txt new file mode 100644 index 0000000..8d36938 --- /dev/null +++ b/extensions/chromium/minimalistic-pac-setter/assets-sources.txt @@ -0,0 +1 @@ +Blue Ribbon Icon: http://www.iconsdb.com/icon-sets/cardboard-blue-icons/ribbon-12-icon.html \ No newline at end of file diff --git a/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js b/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js index 66602a0..9417510 100755 --- a/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js +++ b/extensions/chromium/minimalistic-pac-setter/extension/3-context-menus.js @@ -17,54 +17,14 @@ createMenuLinkEntry( 'Сайт доступен из-за границы? Is up?', (tab) => 'http://isup.me/'+ new URL(tab.url).hostname ); - window.reestrUrl = 'http://reestr.rublacklist.net/search/?q='; + createMenuLinkEntry( 'Сайт в реестре блокировок?', (tab) => 'https://antizapret.info/index.php?search=' + tab.url ); - createMenuLinkEntry( 'Сайт в реестре блокировок?', (tab) => { - - const ifHost = confirm('Да — искать по домену\nНет — искать по IP (зависит от местоположения)'); - const hostname = new URL( tab.url ).hostname; - if (ifHost) { - return reestrUrl + hostname; - } - let ip = window.tabWithError2ip[tab.id]; - if ( /^[.\d]+$/.test(hostname) || /^[:\dA-Fa-f]+$/.test(hostname) ) { - ip = hostname; - } - return ip - ? reestrUrl + ip - : chrome.extension.getURL('./pages/is-ip-blocked/index.html') +'?'+ hostname - }); - - createMenuLinkEntry( 'Из кэша Google', (tab) => 'https://webcache.googleusercontent.com/search?q=cache:' + removeProtocol(tab.url) ); + createMenuLinkEntry( 'Из кэша Google', (tab) => 'http://webcache.googleusercontent.com/search?q=cache:' + removeProtocol(tab.url) ); createMenuLinkEntry( 'Из архива archive.org', (tab) => 'https://web.archive.org/web/*/' + removeProtocol(tab.url) ); createMenuLinkEntry( 'Открыть веб прокси (не наш)', (tab) => 'https://kproxy.com' ); - createMenuLinkEntry( 'Другие варианты', (tab) => { - - const ifPage = confirm('Да — открыть страницу с решениями\nНет — сделать свежий снимок страницы (Screenshot Machine)'); - return ifPage - ? chrome.extension.getURL('./pages/other-unblocks/index.html') + '?' + removeProtocol(tab.url) - : `data:text/html;charset=utf8,Screenshot machine -
- - - -
- `; - }); - - /* - createMenuLinkEntry( 'Свежий снимок страницы, Screenshot machine', (tab) => ` - data:text/html;charset=utf8,Screenshot machine -
- - - -
- ` - ); - */ + createMenuLinkEntry( 'Другие варианты разблокировки', (tab) => 'https://rebrand.ly/unblock#' + tab.url ); }(); diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html b/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html deleted file mode 100755 index bd80a42..0000000 --- a/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - Ищу IP... - - - diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js b/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js deleted file mode 100755 index 7b8c85d..0000000 --- a/extensions/chromium/minimalistic-pac-setter/extension/pages/is-ip-blocked/index.js +++ /dev/null @@ -1,26 +0,0 @@ -'use strict'; -chrome.runtime.getBackgroundPage( (backgroundPage) => { - - const hostname = window.location.search.substring(1); - - backgroundPage.getOneDnsRecord( { host: hostname, type: 'A' }, (err, records) => - err - ? document.write( - `IP уже нет - Не могу получить IP для домена "${hostname}". Домена уже нет?
- Ошибка:
- ${err.clarification && err.clarification.message || err.message}` - ) - : records.length === 1 && records[0].type === 'A' - ? window.location.replace( backgroundPage.reestrUrl + records[0].data ) - : document.write( - 'Выбор IP' - + '

У домена несколько IP / синонимов. Для вашего местоположения:

' - + records - .sort( (a,b) => a.data.localeCompare(b.data) ) - .map( ans => ans.data.link( ans.type === 'A' ? backgroundPage.reestrUrl + ans.data : window.location.pathname +'?'+ ans.data ) ) - .join('
') - ) - ) - -}) diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html b/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html deleted file mode 100755 index e7a964b..0000000 --- a/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - По-другому - - - - - - diff --git a/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js b/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js deleted file mode 100755 index 22a5f3c..0000000 --- a/extensions/chromium/minimalistic-pac-setter/extension/pages/other-unblocks/index.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -const url = decodeURIComponent(window.location.search.substring(1)); -document.body.innerHTML = ` - - -

Веб-прокси

- vpnbook [COPY]
- webproxy.com [COPY]
- buka.link [AVAST, COPY]
- hide.me [COPY]
- Hide my ass [COPY]
- USA Fast Proxy [COPY, HTTP, GLYPE]
- My Safe Surfing [COPY, HTTP, GLYPE]
- Другие -

Из кэша поисковиков

- Google
- viewcached.com
- cachedview.com [COPY] -

Из архивов Интернета

- web.archive.org
- archive.is
- Momento Time Travel [COPY] -

Снимки страниц

- Screenshot Machine [COPY]
- url2png [COPY]
- site2pic [COPY]
- brow shot [COPY] -

Инструменты

- Сайт доступен из-за границы? isup.me
- Сайт доступен из-за границы? host-tracker -`; - -const _ = document.querySelector('input'); -_.onfocus = function() { this.select() }; -document.querySelector('button').onclick = () => {_.focus(); document.execCommand('copy')};