diff --git a/toolkit/mozapps/extensions/content/pluginPrefs.js b/toolkit/mozapps/extensions/content/pluginPrefs.js
index f7098bccfbee..cae0a30ca1d5 100644
--- a/toolkit/mozapps/extensions/content/pluginPrefs.js
+++ b/toolkit/mozapps/extensions/content/pluginPrefs.js
@@ -39,9 +39,9 @@ async function renderPluginMetadata(id) {
}
typeLabel.textContent = types.join(",\n");
let showProtectedModePref = canDisableFlashProtectedMode(plugin);
- document
- .getElementById("pluginEnableProtectedMode")
- .setAttribute("collapsed", showProtectedModePref ? "" : "true");
+ document.getElementById(
+ "pluginEnableProtectedMode"
+ ).hidden = !showProtectedModePref;
// Disable flash blocking when Fission is enabled (See Bug 1584931).
document.getElementById(
@@ -66,7 +66,7 @@ function init() {
let checkbox = document.getElementById(id);
var prefVal = Services.prefs.getBoolPref(PREFS[id].pref);
checkbox.checked = PREFS[id].invert ? !prefVal : prefVal;
- checkbox.addEventListener("command", () => {
+ checkbox.addEventListener("change", () => {
Services.prefs.setBoolPref(
PREFS[id].pref,
PREFS[id].invert ? !checkbox.checked : checkbox.checked
diff --git a/toolkit/mozapps/extensions/content/pluginPrefs.xhtml b/toolkit/mozapps/extensions/content/pluginPrefs.xhtml
new file mode 100644
index 000000000000..4eafb9f261c6
--- /dev/null
+++ b/toolkit/mozapps/extensions/content/pluginPrefs.xhtml
@@ -0,0 +1,72 @@
+
+
+
+%pluginsDTD;
+
+%extensionsDTD;
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/toolkit/mozapps/extensions/content/pluginPrefs.xul b/toolkit/mozapps/extensions/content/pluginPrefs.xul
deleted file mode 100644
index b774d7af3271..000000000000
--- a/toolkit/mozapps/extensions/content/pluginPrefs.xul
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-%brandDTD;
-
-%pluginsDTD;
-
-%extensionsDTD;
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/toolkit/mozapps/extensions/internal/PluginProvider.jsm b/toolkit/mozapps/extensions/internal/PluginProvider.jsm
index e6ebe33100e1..5b00c038bbb8 100644
--- a/toolkit/mozapps/extensions/internal/PluginProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/PluginProvider.jsm
@@ -505,7 +505,7 @@ PluginWrapper.prototype = {
get optionsURL() {
return (
- "chrome://mozapps/content/extensions/pluginPrefs.xul#id=" +
+ "chrome://mozapps/content/extensions/pluginPrefs.xhtml#id=" +
encodeURIComponent(this.id)
);
},
diff --git a/toolkit/mozapps/extensions/jar.mn b/toolkit/mozapps/extensions/jar.mn
index e56c61eb4bc0..f2c1e5cbd071 100644
--- a/toolkit/mozapps/extensions/jar.mn
+++ b/toolkit/mozapps/extensions/jar.mn
@@ -10,7 +10,7 @@ toolkit.jar:
content/mozapps/extensions/extensions.js (content/extensions.js)
content/mozapps/extensions/blocklist.xul (content/blocklist.xul)
content/mozapps/extensions/blocklist.js (content/blocklist.js)
- content/mozapps/extensions/pluginPrefs.xul (content/pluginPrefs.xul)
+ content/mozapps/extensions/pluginPrefs.xhtml (content/pluginPrefs.xhtml)
content/mozapps/extensions/pluginPrefs.js (content/pluginPrefs.js)
content/mozapps/extensions/OpenH264-license.txt (content/OpenH264-license.txt)
content/mozapps/extensions/aboutaddons.html (content/aboutaddons.html)
diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/extensions/extensions.inc.css
index 423589937c0c..1135bdbbb8a1 100644
--- a/toolkit/themes/shared/extensions/extensions.inc.css
+++ b/toolkit/themes/shared/extensions/extensions.inc.css
@@ -775,28 +775,6 @@ button.warning {
margin-inline-end: 5px;
}
-#detail-grid {
- margin-bottom: 2em;
-}
-
-#detail-grid > columns > column:first-child {
- min-width: 15em;
- max-width: 25em;
-}
-
-.detail-row[first-row="true"],
-.detail-row-complex[first-row="true"] {
- border-top: none;
-}
-
-.detail-row,
-.detail-row-complex {
- border-top: 1px solid var(--in-content-box-border-color);
- -moz-box-align: center;
- min-height: 35px;
- line-height: 20px;
-}
-
.inline-options-browser {
margin-top: 2em;
}
@@ -818,18 +796,6 @@ button.warning {
display: none;
}
-.detail-row-footer {
- padding-bottom: 6px;
-}
-
-.detail-row-footer > .preferences-description {
- margin-inline-start: 6px;
- margin-top: 0;
- margin-bottom: 0;
- /* card-width - card-padding - description-margins */
- width: calc(664px - 32px - 11px);
- color: var(--in-content-deemphasized-text);
-}
/*** creator ***/