summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--components/preferences/in-content/advanced.js101
1 files changed, 0 insertions, 101 deletions
diff --git a/components/preferences/in-content/advanced.js b/components/preferences/in-content/advanced.js
index 5f9458e..5b14c74 100644
--- a/components/preferences/in-content/advanced.js
+++ b/components/preferences/in-content/advanced.js
@@ -7,8 +7,6 @@ Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
Components.utils.import("resource://gre/modules/LoadContextInfo.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-const PREF_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled";
-
var gAdvancedPane = {
_inited: false,
@@ -53,10 +51,6 @@ var gAdvancedPane = {
gAdvancedPane.updateHardwareAcceleration);
setEventListener("advancedPrefs", "select",
gAdvancedPane.tabSelectionChanged);
- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
- setEventListener("submitHealthReportBox", "command",
- gAdvancedPane.updateSubmitHealthReport);
- }
setEventListener("connectionSettings", "command",
gAdvancedPane.showConnections);
@@ -223,101 +217,6 @@ var gAdvancedPane = {
}
},
- // DATA CHOICES TAB
-
- /**
- * Set up or hide the Learn More links for various data collection options
- */
- _setupLearnMoreLink: function (pref, element) {
- // set up the Learn More link with the correct URL
- let url = Services.prefs.getCharPref(pref);
- let el = document.getElementById(element);
-
- if (url) {
- el.setAttribute("href", url);
- } else {
- el.setAttribute("hidden", "true");
- }
- },
-
- /**
- *
- */
- initSubmitCrashes: function ()
- {
- this._setupLearnMoreLink("toolkit.crashreporter.infoURL",
- "crashReporterLearnMore");
- },
-
- /**
- * The preference/checkbox is configured in XUL.
- *
- * In all cases, set up the Learn More link sanely.
- */
- initTelemetry: function ()
- {
- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
- this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
- }
- },
-
- /**
- * Set the status of the telemetry controls based on the input argument.
- * @param {Boolean} aEnabled False disables the controls, true enables them.
- */
- setTelemetrySectionEnabled: function (aEnabled)
- {
- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
- // If FHR is disabled, additional data sharing should be disabled as well.
- let disabled = !aEnabled;
- document.getElementById("submitTelemetryBox").disabled = disabled;
- if (disabled) {
- // If we disable FHR, untick the telemetry checkbox.
- Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
- }
- document.getElementById("telemetryDataDesc").disabled = disabled;
- }
- },
-
- /**
- * Initialize the health report service reference and checkbox.
- */
- initSubmitHealthReport: function () {
- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
- this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
-
- let checkbox = document.getElementById("submitHealthReportBox");
-
- if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {
- checkbox.setAttribute("disabled", "true");
- return;
- }
-
- checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);
- this.setTelemetrySectionEnabled(checkbox.checked);
- }
- },
-
- /**
- * Update the health report preference with state from checkbox.
- */
- updateSubmitHealthReport: function () {
- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
- let checkbox = document.getElementById("submitHealthReportBox");
- Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
- this.setTelemetrySectionEnabled(checkbox.checked);
- }
- },
-
- updateOnScreenKeyboardVisibility() {
- if (AppConstants.platform == "win") {
- let minVersion = Services.prefs.getBoolPref("ui.osk.require_win10") ? 10 : 6.2;
- if (Services.vc.compare(Services.sysinfo.getProperty("version"), minVersion) >= 0) {
- document.getElementById("useOnScreenKeyboard").hidden = false;
- }
- }
- },
-
// NETWORK TAB
/*