[tor-commits] [torbrowser/master] Switch to Firefox's native click-to-play for plugins.

[erinn at torproject.org]

commit db11fa55d2a27a01f766bb0c90858381fd9f0c97
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Sat Feb 9 12:23:54 2013 -0800

    Switch to Firefox's native click-to-play for plugins.
    
    The UI is much easier to understand and use than NoScript's.
    
    Unfortunately, we still need NoScript's UI for WebGL and HTML5 video.
---
 build-scripts/config/extension-overrides.js |    7 ++++++-
 build-scripts/config/pound_tor.js           |    1 +
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/build-scripts/config/extension-overrides.js b/build-scripts/config/extension-overrides.js
index d498177..273e104 100644
--- a/build-scripts/config/extension-overrides.js
+++ b/build-scripts/config/extension-overrides.js
@@ -4,11 +4,11 @@
 
 # Torbutton Preferences:
 pref("extensions.torbutton.fresh_install", false);
+pref("extensions.torbutton.tor_enabled", true);
 pref("extensions.torbutton.proxies_applied", true);
 pref("extensions.torbutton.settings_applied", true);
 pref("extensions.torbutton.socks_host", "127.0.0.1");
 pref("extensions.torbutton.socks_port", 9050);
-pref("extensions.torbutton.tor_enabled", true);
 pref("extensions.torbutton.tz_string", "UTC+00:00");
 
 # HTTPS Everywhere Preferences:
@@ -46,3 +46,8 @@ pref("noscript.STS.enabled", false);
 pref("noscript.subscription.lastCheck", -142148139);
 pref("noscript.temp", "");
 pref("noscript.untrusted", "");
+// Now handled by plugins.click_to_play
+pref("noscript.forbidFlash", false);
+pref("noscript.forbidSilverlight", false);
+pref("noscript.forbidJava", false);
+pref("noscript.forbidPlugins", false);
diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js
index c42d13c..c509a37 100644
--- a/build-scripts/config/pound_tor.js
+++ b/build-scripts/config/pound_tor.js
@@ -83,6 +83,7 @@ pref("network.protocol-handler.warn-external.mailto", true);
 pref("network.protocol-handler.warn-external.news", true);
 pref("network.protocol-handler.warn-external.nntp", true);
 pref("network.protocol-handler.warn-external.snews", true);
+pref("plugins.click_to_play", true);
 
 // Network and performance
 pref("network.http.pipelining", true);