tbb-commits September 2018

tbb-commits@lists.torproject.org

2 participants
92 discussions

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 3b34acd2d3b755cef2fbd83ddf37545b6988eb0f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 11:16:49 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27543 (QR code broken on web.whatsapp.com). --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 57f0be3a81f9..bc7c4b05e3a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -154,6 +154,9 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now pref("browser.cache.frecency_experiment", -1); +// Until https://bugzilla.mozilla.org/show_bug.cgi?id=1446472 is solved fall +// back to old canvas behavior. +pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 367ce17b735fdfa1244aa78569e16ac6c90dd746 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 11:16:49 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27543 (QR code broken on web.whatsapp.com). --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 57f0be3a81f9..bc7c4b05e3a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -154,6 +154,9 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now pref("browser.cache.frecency_experiment", -1); +// Until https://bugzilla.mozilla.org/show_bug.cgi?id=1446472 is solved fall +// back to old canvas behavior. +pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0

[torbutton/master] Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 8ff3b44e478ebddf5a067d796f57a353beae2af0 Author: Rusty Bird <rustybird(a)net-c.com> Date: Mon Sep 3 12:32:04 2018 +0000 Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages If about:blank is the homepage (or has been passed as a command line parameter), NoScript will send a message named "fetchChildPolicy" _before_ "started". Torbutton would then send its "updateSettings" too soon, resulting in the dreaded error "Could not establish connection. Receiving end does not exist" (see bug 26520). Fix this by whitelisting the relevant messages from NoScript: "started" and also "pageshow" for a slightly more graceful failure mode in case Torbutton somehow misses NoScript startup. --- src/modules/noscript-control.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 66a00528..cd1a1237 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -125,8 +125,12 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - let messageListener = (a,b,c) => { - log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + let messageListener = (message,b,c) => { + log(3, `Message received from NoScript: ${JSON.stringify([message,b,c])}`); + if (message._messageName !== "started" && + message._messageName !== "pageshow") { + return; + } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 3444c43fc135f68a2da2ebcded8c0adb89254f3f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 10:19:54 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27264 (bookmark items are not visible on the boomark toolbar). --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b602c13e0d5..57f0be3a81f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -269,7 +269,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur rentVersion\":14,\"newElementCount\":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"to olbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 1d974fa2b70dfe07bea896c99c88d7f62f3268a5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 10:19:54 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 27264 (bookmark items are not visible on the boomark toolbar). --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b602c13e0d5..57f0be3a81f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -269,7 +269,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur rentVersion\":14,\"newElementCount\":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"to olbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine

1 0

[tor-launcher/master] Bug 27396: Don't track progress.dtd anymore
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 2b89cfe9069de9851d4b71ccc9abbb4ecf888063 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 31 06:03:35 2018 +0000 Bug 27396: Don't track progress.dtd anymore Since bug 23262 landed progress.dtd is not used anymore. Untrack it for our translations update. --- localization/import-translations.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 0c81aa6..f78df42 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -2,7 +2,6 @@ TRANSLATION_BRANCHES=" tor-launcher-network-settings -tor-launcher-progress tor-launcher-properties "

1 0

[torbutton/master] Bug 26624: Only block OBJECT on highest slider level
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit b9626557ddf9a3faf5fb88f99f479145d7789a7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 06:16:53 2018 +0000 Bug 26624: Only block OBJECT on highest slider level --- src/modules/noscript-control.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index a03755de..66a00528 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -16,20 +16,20 @@ let log = (level, msg) => logger.log(level, msg); // ## NoScript settings // Minimum and maximum capability states as controlled by NoScript. -const max_caps = ["fetch", "font", "frame", "media", "other", "script", "webgl"]; +const max_caps = ["fetch", "font", "frame", "media", "object", "other", "script", "webgl"]; const min_caps = ["frame", "other"]; // Untrusted capabilities for [Standard, Safer, Safest] safety levels. const untrusted_caps = [ max_caps, // standard safety: neither http nor https - ["frame", "font", "other"], // safer: http + ["frame", "font", "object", "other"], // safer: http min_caps, // safest: neither http nor https ]; // Default capabilities for [Standard, Safer, Safest] safety levels. const default_caps = [ max_caps, // standard: both http and https - ["fetch", "font", "frame", "other", "script", "webgl"], // safer: https only + ["fetch", "font", "frame", "object", "other", "script", "webgl"], // safer: https only min_caps, // safest: both http and https ];

1 0

[torbutton/master] Bug 27097: Get the event listener scope right
by gk＠torproject.org 17 Sep '18

17 Sep '18

commit 7540556c69566bc5454be354d877d08b98ac5d99 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 17 20:25:09 2018 +0000 Bug 27097: Get the event listener scope right --- src/chrome/content/aboutTor/aboutTor-content.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ac552e21..ff5a970b 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -60,15 +60,16 @@ var AboutTorListener = { }, setupBannerClosing: function () { + let that = this; let closer = content.document.getElementById("tornews-banner-closer"); closer.addEventListener("click", function () { - sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideTorNewsBanner); }); let link = content.document.querySelector("#tornews-banner-message a"); link.addEventListener("click", function () { // Wait until page unloads so we don't hide banner before that. content.addEventListener("unload", function () { - sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + sendAsyncMessage(that.kAboutTorHideTorNewsBanner); }); }); bindPrefAndInit("extensions.torbutton.tornews_banner_countdown",

1 0

[torbutton/master] Bug 26555: Don't show IP address for meek or snowflake
by gk＠torproject.org 17 Sep '18

17 Sep '18

commit 51c3b458ef0d9bf4a0df42410a4d02e6c49c97d4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 17 09:53:40 2018 -0700 Bug 26555: Don't show IP address for meek or snowflake (the IP address for these PTs looks like 0.x.x.x) Also, we remove some dead code that implemented part of the old circuit display. --- src/chrome/content/tor-circuit-display.js | 34 ++----------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index bbabe1c8..6105fea1 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -229,36 +229,6 @@ let showCircuitDisplay = function (show) { 'block' : 'none'; }; -// __nodeLines(nodeData)__. -// Takes a nodeData array of node items, each like -// `{ ip : "12.34.56.78", country : "fr" }` -// and converts each node data to text, as -// `"France (12.34.56.78)"`. -let nodeLines = function (nodeData) { - let result = []; - for (let {ip, countryCode, type, bridgeType} of nodeData) { - let bridge = type === "bridge", - country = countryCode ? localizedCountryNameFromCode(countryCode) : null; - result.push( - bridge ? - // As we have a bridge, don't show the IP address - // but show the bridge type. - (uiString("tor_bridge") + - ((bridgeType !== "vanilla") ? (": " + bridgeType) : "") + - (country ? " (" + country + ")" : "")) - : - // For each non-bridge relay, show its host country and IP. - country + - // As we don't have a bridge, show the IP address - // of the node. Use unicode escapes to ensure that - // parentheses behave properly in both left-to-right - // and right-to-left languages. - " ‭ (" + (ip || uiString("ip_unknown")) + ")‬" - ); - } - return result; -}; - // __xmlTree(ns, data)__. // Takes an xml namespace, ns, and a // data structure representing xml elements like @@ -324,8 +294,8 @@ let updateCircuitDisplay = function () { } else { relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } - li(relayText, " ", - ["span", { class: "circuit-ip-address" }, nodeData[i].ip], " ", + let ip = nodeData[i].ip.startsWith("0.") ? "" : nodeData[i].ip; + li(relayText, " ", ["span", { class: "circuit-ip-address" }, ip], " ", (i === 0 && nodeData[0].type !== "bridge") ? ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); }

1 0

[torbutton/master] Bug 27097: Tor News signup banner
by gk＠torproject.org 17 Sep '18

17 Sep '18

commit b55672f07a24e5611510840012a32108553cf413 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 27 16:32:20 2018 -0700 Bug 27097: Tor News signup banner The banner disappears permanently: * if the user clicks a small "X" on the right * if the user clicks the "Sign Up" link * if the banner has already been shown 4 times --- src/chrome/content/aboutTor/aboutTor-content.js | 20 +++++++ src/chrome/content/aboutTor/aboutTor.xhtml | 13 +++++ src/chrome/content/torbutton.js | 17 ++++++ src/chrome/skin/aboutTor.css | 72 ++++++++++++++++++++++++ src/chrome/skin/newsletter_3x.png | Bin 0 -> 6735 bytes src/defaults/preferences/preferences.js | 1 + 6 files changed, 123 insertions(+) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ae20505e..ac552e21 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,6 +24,7 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", + kAboutTorHideTorNewsBanner: "AboutTor:HideTorNewsBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -58,6 +59,23 @@ var AboutTorListener = { } }, + setupBannerClosing: function () { + let closer = content.document.getElementById("tornews-banner-closer"); + closer.addEventListener("click", function () { + sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + }); + let link = content.document.querySelector("#tornews-banner-message a"); + link.addEventListener("click", function () { + // Wait until page unloads so we don't hide banner before that. + content.addEventListener("unload", function () { + sendAsyncMessage(this.kAboutTorHideTorNewsBanner); + }); + }); + bindPrefAndInit("extensions.torbutton.tornews_banner_countdown", + countdown => content.document.body.setAttribute( + "show-tornews-banner", countdown > 0)); + }, + onPageLoad: function() { // Arrange to update localized text and links. bindPrefAndInit("intl.locale.requested", aNewVal => { @@ -66,6 +84,8 @@ var AboutTorListener = { } }); + this.setupBannerClosing(); + // Add message and event listeners. addMessageListener(this.kAboutTorChromeDataMessage, this); addEventListener("pagehide", this, false); diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index ecdd0f85..87fe8307 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,6 +31,19 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> + <div id="tornews-banner"> + <div></div> + <div id="tornews-banner-message"> + <div id="tornews-banner-icon"></div> + <div>&aboutTor.newsletter.tagline; + <a href="https://newsletter.torproject.org"> + &aboutTor.newsletter.link_text; + </a> + </div> + </div> + <div id="tornews-banner-closer">×</div> + </div> + <div class="torcontent-container"> <div id="torstatus-version"/> <div id="torstatus" class="top"> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9f6ba898..03dc3563 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,6 +19,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_tornews_banner_countdown = "extensions.torbutton.tornews_banner_countdown"; var m_tb_prefs = Services.prefs; @@ -231,6 +232,14 @@ function torbutton_init_toolbutton() } } +// Show the Sign Up for Tor News banner a finite number of times. +function torbutton_tornews_banner_countdown() { + let count = m_tb_prefs.getIntPref(k_tb_tornews_banner_countdown, 0); + if (count > 0) { + m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, count - 1); + } +} + // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -339,6 +348,10 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); + window.messageManager.addMessageListener("AboutTor:HideTorNewsBanner", + torbutton_abouttor_message_handler); + + torbutton_tornews_banner_countdown(); setupPreferencesForMobile(); @@ -418,6 +431,10 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; + case "AboutTor:HideTorNewsBanner": + torbutton_log(5, "message AboutTor:HideTorNewsBanner received"); + m_tb_prefs.setIntPref(k_tb_tornews_banner_countdown, 0); + break; } }, diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 2e6bab75..ce0a2f29 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -271,3 +271,75 @@ body:not([showmanual]) .showForManual { height: 50px; border-radius: 50px 50px 0 0; } + +/* Tor News Signup Banner + * While this banner is present, we need to + * offset the elements normally at the top of + * the window. + */ + +#tornews-banner { + display: flex; + align-items: center; + background-color: white; + color: var(--abouttor-bg-toron-color); + font-size: 16px; + height: 60px; + justify-content: space-between; + left: 0px; + right: 0px; + top: 0px; + transform: translateY(-60px); + transition: transform 200ms; +} + +body[show-tornews-banner="true"] #tornews-banner { + transform: translateY(0px); + transition: transform 0ms; +} + +#tornews-banner-message { + align-items: center; + display: flex; + justify-content: center; +} + +#tornews-banner-message a { + color: var(--abouttor-bg-toron-color); +} + +#tornews-banner-icon { + background: url('chrome://torbutton/skin/newsletter_3x.png') no-repeat center center; + background-size: cover; + height: 32px; + margin: 0px 16px; + width: 32px; +} + +#tornews-banner-closer { + display: flex; + align-items: center; + font-size: 20px; + height: 22px; + justify-content: center; + margin: 4px 20px; + padding: 4px; + width: 22px; + -moz-user-select: none; +} + +#tornews-banner-closer:hover { + background-color: gray; + cursor: pointer; +} + +body[show-tornews-banner="false"] #torstatus-version, +body[show-tornews-banner="false"] #onboarding-overlay-button { + transition: transform 200ms; +} + +body[show-tornews-banner="true"] #torstatus-version, +body[show-tornews-banner="true"] #onboarding-overlay-button { + transform: translateY(60px); + transition: transform 0ms; +} diff --git a/src/chrome/skin/newsletter_3x.png b/src/chrome/skin/newsletter_3x.png new file mode 100644 index 00000000..821572fa Binary files /dev/null and b/src/chrome/skin/newsletter_3x.png differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 92d1c106..fecf0e69 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,6 +6,7 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); +pref("extensions.torbutton.tornews_banner_countdown", 4); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits September 2018