Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Remove special click handlers for onboarding legal and terms links
Browse files Browse the repository at this point in the history
Bug 1357589 has been fixed, so the links should now behave normally.

Refs #2699.
  • Loading branch information
jaredhirsch committed Feb 1, 2018
1 parent 3aabc17 commit 80a58e4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
10 changes: 0 additions & 10 deletions addon/webextension/background/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,16 +287,6 @@ this.main = (function() {
});
});

// Note: this signal is only needed until bug 1357589 is fixed.
communication.register("openTermsPage", () => {
return catcher.watchPromise(browser.tabs.create({url: "https://www.mozilla.org/about/legal/terms/services/"}));
});

// Note: this signal is also only needed until bug 1357589 is fixed.
communication.register("openPrivacyPage", () => {
return catcher.watchPromise(browser.tabs.create({url: "https://www.mozilla.org/privacy/firefox-cloud/"}));
});

// A Screenshots page wants us to start/force onboarding
communication.register("requestOnboarding", (sender) => {
return startSelectionWithOnboarding(sender.tab);
Expand Down
10 changes: 0 additions & 10 deletions addon/webextension/onboarding/slides.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,6 @@ this.slides = (function() {
shooter.sendEvent("finish-slides", "done");
callbacks.onEnd();
})));
// Note: e10s breaks the terms and privacy anchor tags. Work around this by
// manually opening the correct URLs on click until bug 1357589 is fixed.
doc.querySelector("#terms").addEventListener("click", watchFunction(assertIsTrusted((event) => {
event.preventDefault();
callBackground("openTermsPage");
})));
doc.querySelector("#privacy").addEventListener("click", watchFunction(assertIsTrusted((event) => {
event.preventDefault();
callBackground("openPrivacyPage");
})));
doc.querySelector("#slide-overlay").addEventListener("click", watchFunction(assertIsTrusted((event) => {
if (event.target == doc.querySelector("#slide-overlay")) {
shooter.sendEvent("cancel-slides", "background-click");
Expand Down

0 comments on commit 80a58e4

Please # to comment.