summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-10 13:02:28 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-10 13:02:28 +0100
commit406326715dfb8342617df1e8985a296d0cd1b97c (patch)
tree0a1162b528b0801096d27eeed1e891a29437bd6c
parent974a481d12bf430891725bd3662876358e57e11a (diff)
downloadUXP-406326715dfb8342617df1e8985a296d0cd1b97c.tar
UXP-406326715dfb8342617df1e8985a296d0cd1b97c.tar.gz
UXP-406326715dfb8342617df1e8985a296d0cd1b97c.tar.lz
UXP-406326715dfb8342617df1e8985a296d0cd1b97c.tar.xz
UXP-406326715dfb8342617df1e8985a296d0cd1b97c.zip
Issue #618 - Misc fixes (merge conflicts)
-rw-r--r--dom/html/test/mochitest.ini8
-rw-r--r--modules/libpref/init/all.js4
2 files changed, 8 insertions, 4 deletions
diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini
index 1059bc5d0..b9da7def8 100644
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@@ -605,7 +605,7 @@ skip-if = os == "android" # up/down arrow keys not supported on android
[test_bug1295719_event_sequence_for_number_keys.html]
[test_bug1310865.html]
[test_bug1315146.html]
-+[test_script_module.html]
-+support-files =
-+ file_script_module.html
-+ file_script_nomodule.html \ No newline at end of file
+[test_script_module.html]
+support-files =
+ file_script_module.html
+ file_script_nomodule.html \ No newline at end of file
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 2e3d2aecf..61a2ef1b5 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5486,3 +5486,7 @@ pref("dom.storageManager.enabled", false);
// >0 = suppress further prompts after the user has canceled the dialog n times
// See application preferences for appropriate defaults.
pref("prompts.authentication_dialog_abuse_limit", 0);
+
+// Whether module scripts (<script type="module">) are enabled for content.
+pref("dom.moduleScripts.enabled", false);
+