Bug 1428581 - Make labels of the permission prompt checkboxes clickab…

…le. r=johannh MozReview-Commit-ID: GPPmYqOX3Jb --HG-- extra : rebase_source : 3ad70ff0a7617f22e815b9fef29719e7e2234e3b
dothq · Jan 9, 2018 · fa554e3 · fa554e3
1 parent 62febc5
commit fa554e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/browser/components/preferences/sitePermissions.css b/browser/components/preferences/sitePermissions.css
@@ -22,13 +22,8 @@
   margin-inline-end: 5px;
 }
 
-#permissionsDisableLabel {
-  padding-top: 14px;
-  font-weight: bold;
-}
-
 #permissionsDisableDescription {
-  margin-inline-start: 37px;
+  margin-inline-start: 32px;
   color: #737373;
   line-height: 110%;
 }

diff --git a/browser/components/preferences/sitePermissions.js b/browser/components/preferences/sitePermissions.js
@@ -55,9 +55,7 @@ var gSitePermissionsManager = {
       permissionsText.firstChild.remove();
     permissionsText.appendChild(document.createTextNode(params.introText));
 
-    let permissionsDisableLabel = document.getElementById("permissionsDisableLabel");
-    permissionsDisableLabel.value = params.disablePermissionsLabel;
-
+    this._checkbox.setAttribute("label", params.disablePermissionsLabel);
     let permissionsDisableDescription = document.getElementById("permissionsDisableDescription");
     permissionsDisableDescription.appendChild(document.createTextNode(params.disablePermissionsDescription));
 
@@ -72,7 +70,6 @@ var gSitePermissionsManager = {
 
     if (this._currentDefaultPermissionsState === null) {
       this._checkbox.setAttribute("hidden", true);
-      permissionsDisableLabel.setAttribute("hidden", true);
       permissionsDisableDescription.setAttribute("hidden", true);
     } else if (this._currentDefaultPermissionsState == SitePermissions.BLOCK) {
       this._checkbox.checked = true;

diff --git a/browser/components/preferences/sitePermissions.xul b/browser/components/preferences/sitePermissions.xul
@@ -62,13 +62,8 @@
               oncommand="gSitePermissionsManager.onAllPermissionsDelete();"/>
     </hbox>
     <spacer flex="1"/>
-    <vbox align="start">
-      <hbox align="start">
-        <checkbox id="permissionsDisableCheckbox"/>
-        <label for="permissionsDisableCheckbox" id="permissionsDisableLabel"/>
-      </hbox>
-      <description id="permissionsDisableDescription"/>
-    </vbox>
+    <checkbox id="permissionsDisableCheckbox"/>
+    <description id="permissionsDisableDescription"/>
     <spacer flex="1"/>
     <hbox class="actionButtons" align="right" flex="1">
       <button oncommand="close();" icon="close" id="cancel"