summaryrefslogtreecommitdiff
path: root/data/extensions/https-everywhere@eff.org/pages/options
diff options
context:
space:
mode:
authorAmin Bandali <bandali@gnu.org>2020-04-08 21:52:58 -0400
committerAmin Bandali <bandali@gnu.org>2020-04-08 21:52:58 -0400
commit61dd7225c7b6a2bb9346c76926b5e96264f831b8 (patch)
tree871f406fd2e3dfbfde8645615426e1c4ee15db23 /data/extensions/https-everywhere@eff.org/pages/options
parentf6e3adb6b2344ee2c7bb453a305fd2d6fb4c194c (diff)
Update HTTPS Everywhere to 2020.3.16.
Diffstat (limited to 'data/extensions/https-everywhere@eff.org/pages/options')
-rw-r--r--data/extensions/https-everywhere@eff.org/pages/options/index.html7
-rw-r--r--data/extensions/https-everywhere@eff.org/pages/options/style.css55
-rw-r--r--data/extensions/https-everywhere@eff.org/pages/options/ux.js63
3 files changed, 110 insertions, 15 deletions
diff --git a/data/extensions/https-everywhere@eff.org/pages/options/index.html b/data/extensions/https-everywhere@eff.org/pages/options/index.html
index 078f5ea..6d82a18 100644
--- a/data/extensions/https-everywhere@eff.org/pages/options/index.html
+++ b/data/extensions/https-everywhere@eff.org/pages/options/index.html
@@ -2,6 +2,7 @@
<html>
<head>
<meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=.8">
<title></title>
<link href="style.css" rel="stylesheet">
</head>
@@ -20,6 +21,10 @@
</div>
<div id="disabled-rules-wrapper">
<p class="disabled-rules-wrapper-header" data-i18n="options_disabledUrlsListed"></p>
+ <div id="add-disabled-site-wrapper">
+ <button id="add-disabled-site" data-i18n="options_addDisabledSite"></button>
+ <input type="text" id="disabled-site" />
+ </div>
</div>
</div>
@@ -49,6 +54,8 @@
</div>
</div>
+ <a id="secretArea" href="/pages/debugging-rulesets/index.html" target="_blank" class="hidden" data-i18n="options_debuggingRulesets"></a>
+
<script src="ux.js"></script>
<script src="../translation.js"></script>
<script src="../util.js"></script>
diff --git a/data/extensions/https-everywhere@eff.org/pages/options/style.css b/data/extensions/https-everywhere@eff.org/pages/options/style.css
index d1ff21e..d0f4324 100644
--- a/data/extensions/https-everywhere@eff.org/pages/options/style.css
+++ b/data/extensions/https-everywhere@eff.org/pages/options/style.css
@@ -1,8 +1,37 @@
body{
min-width: 500px;
+ min-height: 250px;
display: block;
}
+@media (prefers-color-scheme: dark) {
+ body {
+ background-color: #202023;
+ color: #f9f9fa;
+ }
+
+ .section-header-span, div#update-channels-warning {
+ color: #000;
+ }
+
+ textarea, input[type=text] {
+ background-color: #202023;
+ color: #f9f9fa;
+ }
+}
+
+a.settings{
+ background-color: #1c87c9;
+ border: none;
+ color: white;
+ padding: 20px 34px;
+ text-align: center;
+ text-decoration: none;
+ display: inline-block;
+ font-size: 20px;
+ margin: 4px 2px;
+}
+
.settings-wrapper{
margin: 10px 0 0 0;
}
@@ -135,13 +164,13 @@ div.update-channel-row-scope {
border-radius: 7px;
}
-button#add-update-channel{
+button#add-update-channel, button#add-disabled-site {
float: right;
margin: 0px 10px 10px 10px;
border-radius: 7px;
}
-input#update-channel-name{
+input#update-channel-name, input#disabled-site {
float: right;
}
@@ -192,3 +221,25 @@ div#update-channels-last-checked {
#update-channels-wrapper{
width: 500px;
}
+
+@keyframes flash {
+ from {
+ background: #fc0;
+ }
+ to {
+ background: transparent;
+ }
+}
+
+#secretArea {
+ border-radius: 5px;
+ padding: 5px;
+}
+
+.hidden {
+ display: none
+}
+
+.flash {
+ animation: flash 1s ease-out;
+}
diff --git a/data/extensions/https-everywhere@eff.org/pages/options/ux.js b/data/extensions/https-everywhere@eff.org/pages/options/ux.js
index 97c5673..fbfc113 100644
--- a/data/extensions/https-everywhere@eff.org/pages/options/ux.js
+++ b/data/extensions/https-everywhere@eff.org/pages/options/ux.js
@@ -5,7 +5,43 @@
"use strict";
+if (navigator.userAgent.includes("Android")) {
+ const url = new URL(window.location.href);
+ if (!url.searchParams.get('redirected')) {
+ url.searchParams.set('redirected', true);
+ document.body.innerText = "";
+ let link = document.createElement("a");
+ link.href = url.href;
+ link.target = "_blank";
+ link.className = "settings";
+ link.innerText = chrome.i18n.getMessage("options_settings");
+ document.body.appendChild(link);
+ }
+}
+
document.addEventListener("DOMContentLoaded", () => {
+ const secretArea = document.getElementById('secretArea')
+
+ const onKeyDownHandler = evt => {
+ if (evt.ctrlKey && evt.key === 'z') {
+ secretArea.classList.remove('hidden')
+ secretArea.classList.add('flash')
+
+ sendMessage('set_option', { developerMode: true })
+
+ document.removeEventListener('keydown', onKeyDownHandler)
+
+ evt.preventDefault()
+ }
+ }
+
+ sendMessage('get_option', { developerMode: false }, item => {
+ if (item.developerMode) {
+ secretArea.classList.remove('hidden')
+ } else {
+ document.addEventListener('keydown', onKeyDownHandler)
+ }
+ })
const autoUpdateRulesets = document.getElementById("autoUpdateRulesets");
const enableMixedRulesets = document.getElementById("enableMixedRulesets");
@@ -246,7 +282,7 @@ document.addEventListener("DOMContentLoaded", () => {
let remove = templateRemove.cloneNode(true);
user_rule_host.className = "user-rules-list-item";
- user_rule_name.className = "user-rules-list-item-single"
+ user_rule_name.className = "user-rules-list-item-single";
user_rule_name.innerText = userRule.name;
user_rule_host.appendChild(user_rule_name);
user_rules_parent.appendChild(user_rule_host);
@@ -265,10 +301,6 @@ document.addEventListener("DOMContentLoaded", () => {
getOption_("disabledList", [], function(item) {
let rule_host_parent = e("disabled-rules-wrapper");
- if( 0 === item.disabledList.length ) {
- hide(rule_host_parent);
- return;
- }
// img element "remove button"
let templateRemove = document.createElement("img");
templateRemove.src = chrome.runtime.getURL("images/remove.png");
@@ -281,7 +313,7 @@ document.addEventListener("DOMContentLoaded", () => {
let rule_host_site_name = document.createElement("p");
rule_host.className = "disabled-rule-list-item";
- rule_host_site_name.className = "disabled-rule-list-item_single"
+ rule_host_site_name.className = "disabled-rule-list-item_single";
rule_host_site_name.innerText = key;
rule_host.appendChild( rule_host_site_name);
rule_host_parent.appendChild(rule_host);
@@ -295,6 +327,18 @@ document.addEventListener("DOMContentLoaded", () => {
}
});
+ const add_disabled_site = document.getElementById("add-disabled-site");
+ const disabled_site_input = document.getElementById("disabled-site");
+ disabled_site_input.setAttribute("placeholder", chrome.i18n.getMessage("options_enterDisabledSite"));
+
+ add_disabled_site.addEventListener("click", function() {
+ sendMessage("disable_on_site", disabled_site_input.value, okay => {
+ if (okay) {
+ chrome.tabs.reload();
+ }
+ });
+ });
+
add_update_channel.addEventListener("click", () => {
const update_channel_name = update_channel_name_div.value;
if(update_channel_name.trim() == "") {
@@ -336,11 +380,4 @@ document.addEventListener("DOMContentLoaded", () => {
}
update_channels_last_checked.innerText = chrome.i18n.getMessage("options_updatesLastChecked") + last_checked_string;
});
-
- document.onkeydown = function(evt) {
- evt = evt || window.event;
- if (evt.ctrlKey && evt.keyCode == 90) {
- window.open("/pages/debugging-rulesets/index.html");
- }
- };
});
home website