mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 08:15:31 +00:00
Bug 1571522 - [Protections Panel] Move _trackingProtectionIconContainer from gIdentityHandler to gProtectionsHandler r=johannh
Differential Revision: https://phabricator.services.mozilla.com/D66615 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
3f8c67d7fd
commit
bb72ba681a
@ -278,12 +278,6 @@ var gIdentityHandler = {
|
||||
}
|
||||
return (this._permissionAnchors = permissionAnchors);
|
||||
},
|
||||
get _trackingProtectionIconContainer() {
|
||||
delete this._trackingProtectionIconContainer;
|
||||
return (this._trackingProtectionIconContainer = document.getElementById(
|
||||
"tracking-protection-icon-container"
|
||||
));
|
||||
},
|
||||
|
||||
get _geoSharingIcon() {
|
||||
delete this._geoSharingIcon;
|
||||
@ -939,7 +933,7 @@ var gIdentityHandler = {
|
||||
this._refreshPermissionIcons();
|
||||
|
||||
// Hide the shield icon if it is a chrome page.
|
||||
this._trackingProtectionIconContainer.classList.toggle(
|
||||
gProtectionsHandler._trackingProtectionIconContainer.classList.toggle(
|
||||
"chromeUI",
|
||||
this._isSecureInternalUI
|
||||
);
|
||||
|
@ -1287,6 +1287,12 @@ var gProtectionsHandler = {
|
||||
"tracking-protection-icon-tooltip-label"
|
||||
));
|
||||
},
|
||||
get _trackingProtectionIconContainer() {
|
||||
delete this._trackingProtectionIconContainer;
|
||||
return (this._trackingProtectionIconContainer = document.getElementById(
|
||||
"tracking-protection-icon-container"
|
||||
));
|
||||
},
|
||||
|
||||
get noTrackersDetectedDescription() {
|
||||
delete this.noTrackersDetectedDescription;
|
||||
@ -1549,10 +1555,7 @@ var gProtectionsHandler = {
|
||||
|
||||
// Add the "open" attribute to the tracking protection icon container
|
||||
// for styling.
|
||||
gIdentityHandler._trackingProtectionIconContainer.setAttribute(
|
||||
"open",
|
||||
"true"
|
||||
);
|
||||
this._trackingProtectionIconContainer.setAttribute("open", "true");
|
||||
|
||||
// Insert the info message if needed. This will be shown once and then
|
||||
// remain collapsed.
|
||||
@ -1571,7 +1574,7 @@ var gProtectionsHandler = {
|
||||
onPopupHidden(event) {
|
||||
if (event.target == this._protectionsPopup) {
|
||||
window.removeEventListener("focus", this, true);
|
||||
gIdentityHandler._trackingProtectionIconContainer.removeAttribute("open");
|
||||
this._trackingProtectionIconContainer.removeAttribute("open");
|
||||
}
|
||||
},
|
||||
|
||||
@ -1629,10 +1632,10 @@ var gProtectionsHandler = {
|
||||
// We hide the icon and thus avoid showing the doorhanger, since
|
||||
// the information contained there would mostly be broken and/or
|
||||
// irrelevant anyway.
|
||||
gIdentityHandler._trackingProtectionIconContainer.hidden = true;
|
||||
this._trackingProtectionIconContainer.hidden = true;
|
||||
return;
|
||||
}
|
||||
gIdentityHandler._trackingProtectionIconContainer.hidden = false;
|
||||
this._trackingProtectionIconContainer.hidden = false;
|
||||
|
||||
// Check whether the user has added an exception for this site.
|
||||
let hasException = ContentBlockingAllowList.includes(
|
||||
@ -2112,7 +2115,7 @@ var gProtectionsHandler = {
|
||||
|
||||
showDisabledTooltipForTPIcon() {
|
||||
this._trackingProtectionIconTooltipLabel.textContent = this.strings.disabledTooltipText;
|
||||
gIdentityHandler._trackingProtectionIconContainer.setAttribute(
|
||||
this._trackingProtectionIconContainer.setAttribute(
|
||||
"aria-label",
|
||||
this.strings.disabledTooltipText
|
||||
);
|
||||
@ -2120,7 +2123,7 @@ var gProtectionsHandler = {
|
||||
|
||||
showActiveTooltipForTPIcon() {
|
||||
this._trackingProtectionIconTooltipLabel.textContent = this.strings.activeTooltipText;
|
||||
gIdentityHandler._trackingProtectionIconContainer.setAttribute(
|
||||
this._trackingProtectionIconContainer.setAttribute(
|
||||
"aria-label",
|
||||
this.strings.activeTooltipText
|
||||
);
|
||||
@ -2128,7 +2131,7 @@ var gProtectionsHandler = {
|
||||
|
||||
showNoTrackerTooltipForTPIcon() {
|
||||
this._trackingProtectionIconTooltipLabel.textContent = this.strings.noTrackerTooltipText;
|
||||
gIdentityHandler._trackingProtectionIconContainer.setAttribute(
|
||||
this._trackingProtectionIconContainer.setAttribute(
|
||||
"aria-label",
|
||||
this.strings.noTrackerTooltipText
|
||||
);
|
||||
@ -2181,10 +2184,7 @@ var gProtectionsHandler = {
|
||||
|
||||
// Add the "open" attribute to the tracking protection icon container
|
||||
// for styling.
|
||||
gIdentityHandler._trackingProtectionIconContainer.setAttribute(
|
||||
"open",
|
||||
"true"
|
||||
);
|
||||
this._trackingProtectionIconContainer.setAttribute("open", "true");
|
||||
|
||||
// Check the panel state of the identity panel. Hide it if needed.
|
||||
if (gIdentityHandler._identityPopup.state != "closed") {
|
||||
@ -2194,7 +2194,7 @@ var gProtectionsHandler = {
|
||||
// Now open the popup, anchored off the primary chrome element
|
||||
PanelMultiView.openPopup(
|
||||
this._protectionsPopup,
|
||||
gIdentityHandler._trackingProtectionIconContainer,
|
||||
this._trackingProtectionIconContainer,
|
||||
{
|
||||
position: "bottomcenter topleft",
|
||||
triggerEvent: event,
|
||||
|
@ -30,13 +30,13 @@ add_task(async function testWithoutNotifications() {
|
||||
await synthesizeKeyAndWaitForFocus(gURLBar, "l", { accelKey: true });
|
||||
is(document.activeElement, gURLBar.inputField, "urlbar should be focused");
|
||||
await synthesizeKeyAndWaitForFocus(
|
||||
gIdentityHandler._trackingProtectionIconContainer,
|
||||
gProtectionsHandler._trackingProtectionIconContainer,
|
||||
"VK_TAB",
|
||||
{ shiftKey: true }
|
||||
);
|
||||
is(
|
||||
document.activeElement,
|
||||
gIdentityHandler._trackingProtectionIconContainer,
|
||||
gProtectionsHandler._trackingProtectionIconContainer,
|
||||
"tracking protection icon container should be focused"
|
||||
);
|
||||
});
|
||||
@ -58,13 +58,13 @@ add_task(async function testWithNotifications() {
|
||||
await synthesizeKeyAndWaitForFocus(gURLBar, "l", { accelKey: true });
|
||||
is(document.activeElement, gURLBar.inputField, "urlbar should be focused");
|
||||
await synthesizeKeyAndWaitForFocus(
|
||||
gIdentityHandler._trackingProtectionIconContainer,
|
||||
gProtectionsHandler._trackingProtectionIconContainer,
|
||||
"VK_TAB",
|
||||
{ shiftKey: true }
|
||||
);
|
||||
is(
|
||||
document.activeElement,
|
||||
gIdentityHandler._trackingProtectionIconContainer,
|
||||
gProtectionsHandler._trackingProtectionIconContainer,
|
||||
"tracking protection icon container should be focused"
|
||||
);
|
||||
await synthesizeKeyAndWaitForFocus(
|
||||
@ -108,7 +108,7 @@ add_task(async function testInvalidPageProxyState() {
|
||||
);
|
||||
isnot(
|
||||
document.activeElement,
|
||||
gIdentityHandler._trackingProtectionIconContainer,
|
||||
gProtectionsHandler._trackingProtectionIconContainer,
|
||||
"tracking protection icon container should not be focused"
|
||||
);
|
||||
// Restore focus to the url bar.
|
||||
|
@ -96,7 +96,7 @@ add_task(async function setup() {
|
||||
|
||||
is(
|
||||
BrowserTestUtils.is_hidden(
|
||||
gIdentityHandler._trackingProtectionIconContainer
|
||||
gProtectionsHandler._trackingProtectionIconContainer
|
||||
),
|
||||
testData.hidden,
|
||||
"tracking protection icon container is correctly displayed"
|
||||
|
@ -52,8 +52,7 @@ function openIdentityPopup() {
|
||||
function openProtectionsPopup() {
|
||||
let mainView = document.getElementById("protections-popup-mainView");
|
||||
let viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
|
||||
// TODO: This should click on the icon once we have it.
|
||||
gIdentityHandler._trackingProtectionIconContainer.click();
|
||||
gProtectionsHandler._trackingProtectionIconContainer.click();
|
||||
return viewShown;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user