diff --git a/extensions/chromium/runet-censorship-bypass/assets/README.md b/extensions/chromium/runet-censorship-bypass/assets/README.md
new file mode 100644
index 0000000..bf665b3
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/assets/README.md
@@ -0,0 +1,8 @@
+# Blue Ribbon Icon
+
+URL: http://www.iconsdb.com/icon-sets/cardboard-blue-icons/ribbon-12-icon.html
+
+# SVG Icons, emoji
+
+URL: https://github.com/jslegers/emoji-icon-font
+Author: John Slegers aka jslegers
\ No newline at end of file
diff --git a/extensions/chromium/runet-censorship-bypass/assets/jslegers-emoji.svg b/extensions/chromium/runet-censorship-bypass/assets/jslegers-emoji.svg
new file mode 100644
index 0000000..e0b89f2
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/assets/jslegers-emoji.svg
@@ -0,0 +1,2711 @@
+
diff --git a/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-circle - inkscape.svg b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-circle - inkscape.svg
new file mode 100644
index 0000000..c8e9133
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-circle - inkscape.svg
@@ -0,0 +1,61 @@
+
+
diff --git a/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-circle.svg b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-circle.svg
new file mode 100644
index 0000000..865d100
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-circle.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-path-strokeless.svg b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-path-strokeless.svg
new file mode 100644
index 0000000..1b72435
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-path-strokeless.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-path.svg b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-path.svg
new file mode 100644
index 0000000..c972f9b
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/assets/my-circled-information-path.svg
@@ -0,0 +1,7 @@
+
\ No newline at end of file
diff --git a/extensions/chromium/runet-censorship-bypass/gulpfile.js b/extensions/chromium/runet-censorship-bypass/gulpfile.js
index 55963c0..41da081 100644
--- a/extensions/chromium/runet-censorship-bypass/gulpfile.js
+++ b/extensions/chromium/runet-censorship-bypass/gulpfile.js
@@ -19,8 +19,9 @@ const templatePlugin = (context) => through.obj(function(file, encoding, cb) {
return cb(new PluginError(PluginName, 'Streams not supported!'));
} else if (file.isBuffer()) {
- const {keys, values} = Object.entries(context).reduce( (acc, [key, value]) => {
+ const {keys, values} = Object.keys(context).reduce( (acc, key) => {
+ const value = context[key];
acc.keys.push(key);
acc.values.push(value);
return acc;
diff --git a/extensions/chromium/runet-censorship-bypass/package.json b/extensions/chromium/runet-censorship-bypass/package.json
index 7daf769..e161dd3 100644
--- a/extensions/chromium/runet-censorship-bypass/package.json
+++ b/extensions/chromium/runet-censorship-bypass/package.json
@@ -3,7 +3,8 @@
"version": "0.0.19",
"description": "Development tools for chromium extension",
"scripts": {
- "lint": "./node_modules/.bin/eslint ./src/**/*.js --ignore-pattern vendor"
+ "lint": "eslint ./src/**/*.js --ignore-pattern vendor",
+ "gulp": "gulp"
},
"author": "Ilya Ig. Petrov",
"license": "GPLv3",
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
index d3d726d..e34c5d3 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
@@ -109,6 +109,7 @@
|| Boolean(defaults[prop]) === Boolean(mods[prop])
);
+ console.log('MODS', mods);
Object.assign(this, defaults, mods);
this.ifNoMods = ifAllDefaults ? true : false;
@@ -149,7 +150,7 @@
this.excluded.push(host);
}
}
- if (this.included && !this.filteredCustomsString) {
+ if (this.included.length && !this.filteredCustomsString) {
throw new TypeError(
'Проксировать свои сайты можно только через свои прокси. Нет ни одного своего прокси, удовлетворяющего вашим требованиям!'
);
@@ -214,11 +215,11 @@
}
return res + `
- const originalProxyString = originalFindProxyForURL(url, host);
- let originalProxyArray = originalProxyString.split(/(?:\\s*;\\s*)+/g).filter( (p) => p );
- if (originalProxyArray.every( (p) => /^DIRECT$/i.test(p) )) {
+ const pacProxyString = originalFindProxyForURL(url, host);
+ let pacProxyArray = pacProxyString.split(/(?:\\s*;\\s*)+/g).filter( (p) => p );
+ if (pacProxyArray.every( (p) => /^DIRECT$/i.test(p) )) {
// Directs only or null, no proxies.
- return originalProxyString;
+ return pacProxyString;
}
return ` +
function() {
@@ -226,15 +227,15 @@
if (!pacMods.ifUsePacScriptProxies) {
return '"' + pacMods.filteredCustomsString + '"';
}
- let filteredOriginalsExp = 'originalProxyString';
+ let filteredPacExp = 'pacProxyString';
if (pacMods.ifUseSecureProxiesOnly) {
- filteredOriginalsExp =
- 'originalProxyArray.filter( (p) => !p.toUpperCase().startsWith("HTTP ") ).join("; ")';
+ filteredPacExp =
+ 'pacProxyArray.filter( (p) => !p.toUpperCase().startsWith("HTTP ") ).join("; ")';
}
if ( !pacMods.filteredCustomsString ) {
- return filteredOriginalsExp;
+ return filteredPacExp;
}
- return '"' + pacMods.filteredCustomsString + '; " + ' + filteredOriginalsExp;
+ return filteredPacExp + '"; ' + pacMods.filteredCustomsString + '"';
}() + ' + "; DIRECT";'; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
@@ -292,7 +293,6 @@
},
-
keepCookedNowAsync(pacMods = mandatory(), cb = throwIfError) {
if (typeof(pacMods) === 'function') {
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 de3c557..e0af068 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
@@ -7,8 +7,9 @@
--ribbon-color: #4169e1;
--blue-bg: dodgerblue;
--default-grey: #bfbfbf;
- max-width: 27em;
+ max-width: 28em;
}
+
body {
margin: 0;
}
@@ -45,6 +46,9 @@
li, li > * {
vertical-align: middle;
}
+ input[type="radio"], input[type="checkbox"] {
+ flex-shrink: 0;
+ }
input[type="radio"], label {
cursor: pointer;
}
@@ -205,34 +209,22 @@
/* INFO SIGNS */
.info-row {
- display: table;
- width: 100%;
-
position: relative;
}
- .info-sign {
- font-size: 1.4em;
- vertical-align: middle;
- line-height: 100%;
+ .right-bottom-icon {
margin-left: 0.1em;
+ vertical-align: bottom;
}
- .info-url {
+ .info-url, .info-url:hover {
text-decoration: none;
-
- float: right;
- text-align: right;
-
- line-height: normal !important;
- vertical-align: top !important;
}
/* Source: https://jsfiddle.net/greypants/zgCb7/ */
.desc {
- display: table-cell;
text-align: right;
color: var(--ribbon-color);
cursor: help;
- width: 1%;
+ padding-left: 0.3em;
}
.tooltip {
display: none;
@@ -265,13 +257,13 @@
right: 0;
height: 0;
}
- /* This bridges the gap so you can mouse into the tooltip without it disappearing */
+ /* This bridges the gap so you can mouse into the tooltip without it disappearing. */
.desc .tooltip:before {
position: absolute;
top: -1em;
content: "";
display: block;
- height: 1.6em;
+ height: 1.2em;
left: 75%;
width: calc(25% + 0.6em);
}
@@ -355,6 +347,14 @@
margin: 1em 0 1em 0;
}
+ .hor-flex > input:not([type="button"]) {
+ align-self: flex-end;
+ }
+ .label-container {
+ flex-grow: 9;
+ padding-left: 0.3em;
+ }
+
/* STATUS */
#status-row {
@@ -371,6 +371,25 @@
.other-version:hover {
text-decoration: none;
}
+
+ @font-face {
+ font-family: "emoji";
+ src:url("../lib/fonts/emoji.woff") format("woff");
+ font-weight: normal;
+ font-style: normal;
+ }
+ .emoji {
+ font-family: "emoji";
+ }
+
+ svg.icon {
+ display: inline-block;
+ width: 1em;
+ height: 1em;
+ stroke-width: 0;
+ stroke: currentColor;
+ fill: currentColor;
+ }
@@ -397,10 +416,16 @@
-
- Обновлялись:
...
+
@@ -416,7 +441,11 @@
- -
+ -
+
+
-
-
@@ -445,10 +474,8 @@
-
+