mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 16:55:40 +00:00
Bug 1573565 - [Protections Panel] Remove strict mode hint from trackers subview. r=johannh
Differential Revision: https://phabricator.services.mozilla.com/D42821 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
23291e6c74
commit
56dca3a160
@ -311,13 +311,6 @@ var TrackingProtection = {
|
|||||||
));
|
));
|
||||||
},
|
},
|
||||||
|
|
||||||
get strictInfo() {
|
|
||||||
delete this.strictInfo;
|
|
||||||
return (this.strictInfo = document.getElementById(
|
|
||||||
"protections-popup-trackersView-strict-info"
|
|
||||||
));
|
|
||||||
},
|
|
||||||
|
|
||||||
strings: {
|
strings: {
|
||||||
get subViewBlocked() {
|
get subViewBlocked() {
|
||||||
delete this.subViewBlocked;
|
delete this.subViewBlocked;
|
||||||
@ -411,9 +404,6 @@ var TrackingProtection = {
|
|||||||
let contentBlockingLog = await gBrowser.selectedBrowser.getContentBlockingLog();
|
let contentBlockingLog = await gBrowser.selectedBrowser.getContentBlockingLog();
|
||||||
contentBlockingLog = JSON.parse(contentBlockingLog);
|
contentBlockingLog = JSON.parse(contentBlockingLog);
|
||||||
|
|
||||||
// Don't tell the user to turn on TP if they are already blocking trackers.
|
|
||||||
this.strictInfo.hidden = this.enabled;
|
|
||||||
|
|
||||||
let fragment = document.createDocumentFragment();
|
let fragment = document.createDocumentFragment();
|
||||||
for (let [origin, actions] of Object.entries(contentBlockingLog)) {
|
for (let [origin, actions] of Object.entries(contentBlockingLog)) {
|
||||||
let listItem = await this._createListItem(origin, actions);
|
let listItem = await this._createListItem(origin, actions);
|
||||||
|
@ -46,15 +46,6 @@ async function assertSitesListed(blocked) {
|
|||||||
);
|
);
|
||||||
is(listItems.length, 1, "We have 1 tracker in the list");
|
is(listItems.length, 1, "We have 1 tracker in the list");
|
||||||
|
|
||||||
let strictInfo = document.getElementById(
|
|
||||||
"protections-popup-trackersView-strict-info"
|
|
||||||
);
|
|
||||||
is(
|
|
||||||
BrowserTestUtils.is_hidden(strictInfo),
|
|
||||||
Services.prefs.getBoolPref(TP_PREF),
|
|
||||||
"Strict info is hidden if TP is enabled."
|
|
||||||
);
|
|
||||||
|
|
||||||
let mainView = document.getElementById("protections-popup-mainView");
|
let mainView = document.getElementById("protections-popup-mainView");
|
||||||
viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
|
viewShown = BrowserTestUtils.waitForEvent(mainView, "ViewShown");
|
||||||
let backButton = trackersView.querySelector(".subviewbutton-back");
|
let backButton = trackersView.querySelector(".subviewbutton-back");
|
||||||
|
@ -191,10 +191,6 @@
|
|||||||
</vbox>
|
</vbox>
|
||||||
<vbox id="protections-popup-trackersView-list" class="protections-popup-list">
|
<vbox id="protections-popup-trackersView-list" class="protections-popup-list">
|
||||||
</vbox>
|
</vbox>
|
||||||
<hbox id="protections-popup-trackersView-strict-info">
|
|
||||||
<image/>
|
|
||||||
<label>&contentBlocking.trackersView.strictInfo.label;</label>
|
|
||||||
</hbox>
|
|
||||||
<vbox class="panel-footer">
|
<vbox class="panel-footer">
|
||||||
<button id="protections-popup-trackersView-settings-button"
|
<button id="protections-popup-trackersView-settings-button"
|
||||||
label="&contentBlocking.manageSettings2.label;"
|
label="&contentBlocking.manageSettings2.label;"
|
||||||
|
@ -795,8 +795,6 @@ you can use these alternative items. Otherwise, their values should be empty. -
|
|||||||
<!ENTITY contentBlocking.manageSettings2.label "Manage Protection Settings">
|
<!ENTITY contentBlocking.manageSettings2.label "Manage Protection Settings">
|
||||||
<!ENTITY contentBlocking.manageSettings.accesskey "M">
|
<!ENTITY contentBlocking.manageSettings.accesskey "M">
|
||||||
|
|
||||||
<!ENTITY contentBlocking.trackersView.strictInfo.label "To block all trackers, set content blocking to “Strict”.">
|
|
||||||
|
|
||||||
<!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
|
<!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
|
||||||
|
|
||||||
<!ENTITY contentBlocking.cookies2.label "Cross-Site Tracking Cookies">
|
<!ENTITY contentBlocking.cookies2.label "Cross-Site Tracking Cookies">
|
||||||
|
Loading…
Reference in New Issue
Block a user