Permissions - Plugins (follow up)

5 files changed, 40 insertions, 5 deletions

diff --git a/browser/components/preferences/aboutPermissions.js b/browser/components/preferences/aboutPermissions.js
index 190d06264..43155a20f 100644
--- a/browser/components/preferences/aboutPermissions.js
+++ b/browser/components/preferences/aboutPermissions.js
@@ -531,6 +531,7 @@ let AboutPermissions = {
       let permString = pluginHost.getPermissionStringForType(mimeType);
       let permissionEntry = document.createElementNS(XUL_NS, "box");
       permissionEntry.setAttribute("label", this.makeNicePluginName(plugin.name));
+      permissionEntry.setAttribute("vulnerable", "");
       permissionEntry.setAttribute("mimeType", mimeType);
       permissionEntry.setAttribute("permString", permString);
       permissionEntry.setAttribute("class", "pluginPermission");
@@ -978,6 +979,7 @@ let AboutPermissions = {
           document.getElementById(aType + "-0").disabled = true;
         }
         let pluginPermissionEntry = document.getElementById(aType + "-entry");
+        pluginPermissionEntry.setAttribute("vulnerable", "");
         if (pluginPermissionEntry.isBlocklisted()) {
           permissionMenulist.disabled = true;
           permissionMenulist.setAttribute("tooltiptext",
@@ -998,12 +1000,14 @@ let AboutPermissions = {
         document.getElementById(aType + "-0").disabled = false;
         let pluginPermissionEntry = document.getElementById(aType + "-entry");
         let permString = pluginPermissionEntry.getAttribute("permString");
-        let name = pluginPermissionEntry.getAttribute("label");
         if (permString.startsWith("plugin-vulnerable:")) {
-          name += " \u2014 " + AboutPermissions._stringBundleBrowser
-                  .GetStringFromName("pluginActivateVulnerable.label");
-          pluginPermissionEntry.setAttribute("label", name);
+          let nameVulnerable = " \u2014 "
+              + AboutPermissions._stringBundleBrowser
+                .GetStringFromName("pluginActivateVulnerable.label");
+          pluginPermissionEntry.setAttribute("vulnerable", nameVulnerable);
         }
+        permissionMenulist.disabled = false;
+        permissionMenulist.removeAttribute("tooltiptext");
       }
       let result = {};
       permissionValue = this._selectedSite.getPermission(aType, result) ?
diff --git a/browser/components/preferences/aboutPermissions.xml b/browser/components/preferences/aboutPermissions.xml
index df44bedc6..853e93dc4 100644
--- a/browser/components/preferences/aboutPermissions.xml
+++ b/browser/components/preferences/aboutPermissions.xml
@@ -23,7 +23,8 @@
   <binding id="pluginPermission">
     <content>
       <xul:hbox flex="1" align="baseline">
-        <xul:label xbl:inherits="value=label"/>
+        <xul:label xbl:inherits="value=label" class="plugins-label"/>
+        <xul:label xbl:inherits="value=vulnerable" class="plugins-vulnerable"/>
         <xul:spacer flex="1"/>
         <xul:menulist anonid="plugins-menulist"
                       class="pref-menulist"
diff --git a/browser/themes/linux/preferences/aboutPermissions.css b/browser/themes/linux/preferences/aboutPermissions.css
index c16faf0c7..d2c6c0bb6 100644
--- a/browser/themes/linux/preferences/aboutPermissions.css
+++ b/browser/themes/linux/preferences/aboutPermissions.css
@@ -114,3 +114,13 @@
   margin-left: 6px;
   margin-right: 6px;
 }
+
+.plugins-label {
+  margin-right: 0;
+  padding-right: 0;
+}
+
+.plugins-vulnerable {
+  margin-left: 0;
+  padding-left: 0;
+}
diff --git a/browser/themes/osx/preferences/aboutPermissions.css b/browser/themes/osx/preferences/aboutPermissions.css
index de852f048..0d8764498 100644
--- a/browser/themes/osx/preferences/aboutPermissions.css
+++ b/browser/themes/osx/preferences/aboutPermissions.css
@@ -118,3 +118,13 @@
   margin-right: 6px;
   min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
 }
+
+.plugins-label {
+  margin-right: 0;
+  padding-right: 0;
+}
+
+.plugins-vulnerable {
+  margin-left: 0;
+  padding-left: 0;
+}
diff --git a/browser/themes/windows/preferences/aboutPermissions.css b/browser/themes/windows/preferences/aboutPermissions.css
index de852f048..0d8764498 100644
--- a/browser/themes/windows/preferences/aboutPermissions.css
+++ b/browser/themes/windows/preferences/aboutPermissions.css
@@ -118,3 +118,13 @@
   margin-right: 6px;
   min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */
 }
+
+.plugins-label {
+  margin-right: 0;
+  padding-right: 0;
+}
+
+.plugins-vulnerable {
+  margin-left: 0;
+  padding-left: 0;
+}