Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-07-08 10:54:34 +08:00
commit fe79e2a96a
19 changed files with 219 additions and 177 deletions

View file

@ -19,41 +19,15 @@ var gPrivacyPane = {
/**
* Sets up the UI for the number of days of history to keep, and updates the
* label of the "Clear Now..." button.
* Also restores the previously selected tab or tab index passed as argument.
*/
init: function()
{
this._inited = true;
var privacyPrefs = document.getElementById("privacyPrefs");
var extraArgs = window.arguments[1];
if (extraArgs && extraArgs["privacyTab"]){
privacyPrefs.selectedTab = document.getElementById(extraArgs["privacyTab"]);
} else {
var preference = document.getElementById("browser.preferences.privacy.selectedTabIndex");
if (preference.value !== null)
privacyPrefs.selectedIndex = preference.value;
}
this._updateSanitizeSettingsButton();
this.initializeHistoryMode();
this.updateHistoryModePane();
this.updatePrivacyMicroControls();
this.initAutoStartPrivateBrowsingReverter();
},
/**
* Stores the identity of the current tab in preferences so that the selected
* tab can be persisted between openings of the preferences window.
*/
tabSelectionChanged: function()
{
if (!this._inited)
return;
var privacyPrefs = document.getElementById("privacyPrefs");
var preference = document.getElementById("browser.preferences.privacy.selectedTabIndex");
preference.valueFromPreferences = privacyPrefs.selectedIndex;
},
// HISTORY MODE

View file

@ -22,10 +22,6 @@
<preferences id="privacyPreferences">
<preference id="browser.preferences.privacy.selectedTabIndex"
name="browser.preferences.privacy.selectedTabIndex"
type="int"/>
<!-- Tracking -->
<preference id="privacy.donottrackheader.enabled"
name="privacy.donottrackheader.enabled"