[tor-commits] [tor-browser-bundle/master] Bug 14849: Remove new NoScript option to make permissions permanent

[mikeperry at torproject.org]

commit c5e6ba341a3cda60cad0fb905213423ad6279b40
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Feb 10 16:55:57 2015 -0800

    Bug 14849: Remove new NoScript option to make permissions permanent
---
 .../Data/Browser/profile.default/preferences/extension-overrides.js   |    1 +
 .../Data/Browser/profile.default/preferences/extension-overrides.js   |    1 +
 .../Data/Browser/profile.default/preferences/extension-overrides.js   |    1 +
 3 files changed, 3 insertions(+)

diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
index 3b8e31e..39fa6a9 100644
--- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -59,3 +59,4 @@ pref("noscript.autoReload", true);
 pref("noscript.autoReload.allTabs", false);
 pref("noscript.cascadePermissions", true);
 pref("noscript.restrictSubdocScripting", true);
+pref("noscript.showVolatilePrivatePermissionsToggle", false);
diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
index 3b8e31e..39fa6a9 100644
--- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -59,3 +59,4 @@ pref("noscript.autoReload", true);
 pref("noscript.autoReload.allTabs", false);
 pref("noscript.cascadePermissions", true);
 pref("noscript.restrictSubdocScripting", true);
+pref("noscript.showVolatilePrivatePermissionsToggle", false);
diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
index 02cee1b..f5a3f3c 100644
--- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -59,3 +59,4 @@ pref("noscript.autoReload", true);
 pref("noscript.autoReload.allTabs", false);
 pref("noscript.cascadePermissions", true);
 pref("noscript.restrictSubdocScripting", true);
+pref("noscript.showVolatilePrivatePermissionsToggle", false);