Commit 4394ffb2 authored by Mike Perry's avatar Mike Perry
Browse files

Bug 15334: Display Cookie Protections menu choice if disk records enabled.

Regression caused during #14632.
parent bc8f182f
......@@ -2107,10 +2107,6 @@ function torbutton_update_disk_prefs() {
m_tb_prefs.setIntPref("browser.download.manager.retention", 2);
}
// XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR
// See https://trac.torproject.org/projects/tor/ticket/10353 for more info.
document.getElementById("torbutton-cookie-protector").hidden = mode;
// Force prefs to be synced to disk
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService);
......@@ -2606,6 +2602,10 @@ function torbutton_check_protections()
var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections");
document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref;
// XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR
// See https://trac.torproject.org/projects/tor/ticket/10353 for more info.
document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk");
if (!m_tb_control_pass || !m_tb_control_port)
document.getElementById("torbutton-new-identity").disabled = true;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment