Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
torbutton
Commits
824e6df6
Commit
824e6df6
authored
Jun 21, 2018
by
Georg Koppen
Browse files
Merge remote-tracking branch 'gk/bug_26058'
parents
46c71b6a
72aacbd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/chrome/content/torbutton.js
View file @
824e6df6
...
...
@@ -176,9 +176,6 @@ var torbutton_unique_pref_observer =
case
"
privacy.firstparty.isolate
"
:
torbutton_update_isolation_prefs
();
break
;
case
"
extensions.torbutton.hide_sync_ui
"
:
torbutton_update_sync_ui
();
break
;
}
}
}
...
...
@@ -406,7 +403,6 @@ function torbutton_init() {
torbutton_update_toolbutton
();
torbutton_notify_if_update_needed
();
torbutton_update_sync_ui
();
createTorCircuitDisplay
(
m_tb_control_ipc_file
,
m_tb_control_host
,
m_tb_control_port
,
m_tb_control_pass
,
...
...
@@ -2341,18 +2337,6 @@ function torbutton_is_homepage_url(aURI)
return
(
urls
.
indexOf
(
aURI
.
spec
)
>=
0
);
}
// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so,
// hide the "Sign in to Sync" button on the hamburger menu.
function
torbutton_update_sync_ui
()
{
try
{
document
.
getElementById
(
"
PanelUI-footer-fxa
"
).
style
.
display
=
getBoolPref
(
"
extensions.torbutton.hide_sync_ui
"
)
?
"
none
"
:
""
;
}
catch
(
e
)
{
torbutton_log
(
5
,
'
Error updating the Sync UI:
'
+
e
);
}
}
// Update the NoScript button to reflect any changes to noscript prefs
function
torbutton_update_noscript_button
()
{
...
...
src/defaults/preferences/preferences.js
View file @
824e6df6
...
...
@@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo
pref
(
"
extensions.torbutton.display_circuit
"
,
true
);
pref
(
"
extensions.torbutton@torproject.org.description
"
,
"
chrome://torbutton/locale/torbutton.properties
"
);
pref
(
"
extensions.torbutton.updateNeeded
"
,
false
);
pref
(
"
extensions.torbutton.hide_sync_ui
"
,
true
);
// Tor check and proxy prefs
pref
(
"
extensions.torbutton.test_enabled
"
,
true
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment