commit 4394ffb289e78fbec0c772481570b55776e0d0dc Author: Mike Perry mikeperry-git@torproject.org Date: Tue Mar 17 19:36:40 2015 -0700
Bug 15334: Display Cookie Protections menu choice if disk records enabled.
Regression caused during #14632. --- src/chrome/content/torbutton.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a14a097..09d6080 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -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;