summaryrefslogtreecommitdiffstats
path: root/application/palemoon
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-09-06 10:32:40 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-09-06 10:32:40 +0200
commit2d33b998c72d57abcde836bd2985ad72265d9697 (patch)
tree7e6cb902694ac348b6b785a14a997451d0b80951 /application/palemoon
parent47f4227deac7db16fbb8f4aec0376f552fc296b5 (diff)
parent9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7 (diff)
downloadUXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar
UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.gz
UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.lz
UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.xz
UXP-2d33b998c72d57abcde836bd2985ad72265d9697.zip
Merge branch 'release' into Pale_Moon-release
# Conflicts: # application/palemoon/config/version.txt
Diffstat (limited to 'application/palemoon')
-rw-r--r--application/palemoon/app/profile/palemoon.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index ee71c4ea1..df46ea4b6 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -682,6 +682,15 @@ pref("plugins.update.notifyUser", false);
//Enable tri-state option (Always/Never/Ask)
pref("plugins.click_to_play", true);
+// Platform pref is to enable all plugins by default.
+// Uncomment this pref to default to click-to-play
+// pref("plugin.default.state", 1);
+
+// Don't load plugin instances with no src declared.
+// These prefs are documented in detail in all.js.
+pref("plugins.favorfallback.mode", "follow-ctp");
+pref("plugins.favorfallback.rules", "nosrc");
+
#ifdef XP_WIN
pref("browser.preferences.instantApply", false);
#else