From 61dd7225c7b6a2bb9346c76926b5e96264f831b8 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 8 Apr 2020 21:52:58 -0400 Subject: Update HTTPS Everywhere to 2020.3.16. --- .../pages/options/index.html | 7 +++ .../pages/options/style.css | 55 ++++++++++++++++++- .../https-everywhere@eff.org/pages/options/ux.js | 63 +++++++++++++++++----- 3 files changed, 110 insertions(+), 15 deletions(-) (limited to 'data/extensions/https-everywhere@eff.org/pages/options') 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 @@ + @@ -20,6 +21,10 @@

+
+ + +
@@ -49,6 +54,8 @@ + + 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"); - } - }; }); -- cgit v1.2.3