Skip to content

Commit 6981084

Browse files
committed
Bug 1942021 - fix CSP violations in about:rights and make the code nicer, r=darktrojan,desktop-theme-reviewers,dao
Differential Revision: https://phabricator.services.mozilla.com/D234530
1 parent f1a07f3 commit 6981084

File tree

3 files changed

+13
-24
lines changed

3 files changed

+13
-24
lines changed

toolkit/content/aboutRights.js

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,25 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
var servicesDiv = document.getElementById("webservices-container");
6-
servicesDiv.style.display = "none";
7-
8-
function showServices() {
9-
servicesDiv.style.display = "";
10-
}
6+
servicesDiv.hidden = true;
117

128
// Fluent replaces the children of the element being overlayed which prevents us
139
// from putting an event handler directly on the children.
14-
let rightsIntro =
15-
document.querySelector("[data-l10n-id=rights-intro-point-5]") ||
16-
document.querySelector("[data-l10n-id=rights-intro-point-5-unbranded]");
17-
rightsIntro.addEventListener("click", event => {
10+
document.body.addEventListener("click", event => {
1811
if (event.target.id == "showWebServices") {
19-
showServices();
12+
servicesDiv.hidden = false;
2013
}
2114
});
2215

2316
var disablingServicesDiv = document.getElementById(
2417
"disabling-webservices-container"
2518
);
2619

27-
function showDisablingServices() {
28-
disablingServicesDiv.style.display = "";
29-
}
30-
3120
if (disablingServicesDiv != null) {
32-
disablingServicesDiv.style.display = "none";
33-
// Same issue here with Fluent replacing the children affecting the event listeners.
34-
let rightsWebServices = document.querySelector(
35-
"[data-l10n-id=rights-webservices]"
36-
);
37-
rightsWebServices.addEventListener("click", event => {
21+
disablingServicesDiv.hidden = true;
22+
servicesDiv.addEventListener("click", event => {
3823
if (event.target.id == "showDisablingWebServices") {
39-
showDisablingServices();
24+
disablingServicesDiv.hidden = false;
4025
}
4126
});
4227
}

toolkit/content/aboutRights.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
></a>
8484
</p>
8585

86-
<div id="disabling-webservices-container" style="margin-left: 40px">
86+
<div id="disabling-webservices-container">
8787
<a name="disabling-webservices" />
8888
<p data-l10n-id="rights-safebrowsing"></p>
8989
<ul>

toolkit/themes/shared/aboutRights.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@
1212
display: flex;
1313
align-items: center;
1414
padding-inline-end: 320px;
15+
16+
&:dir(rtl) {
17+
background-position-x: left;
18+
}
1519
}
1620

17-
.rights-header:dir(rtl) {
18-
background-position: left center;
21+
#disabling-webservices-container {
22+
margin-inline-start: 40px;
1923
}

0 commit comments

Comments
 (0)