Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 21 insertions, 0 deletions

diff --git a/application/basilisk/components/preferences/sanitize.js b/application/basilisk/components/preferences/sanitize.js
new file mode 100644
index 000000000..3504bffd6
--- /dev/null
+++ b/application/basilisk/components/preferences/sanitize.js
@@ -0,0 +1,21 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var gSanitizeDialog = Object.freeze({
+  init: function() {
+    let customWidthElements = document.getElementsByAttribute("dialogWidth", "*");
+    let isInSubdialog = document.documentElement.hasAttribute("subdialog");
+    for (let element of customWidthElements) {
+      element.style.width = element.getAttribute(isInSubdialog ? "subdialogWidth" : "dialogWidth");
+    }
+    this.onClearHistoryChanged();
+  },
+
+  onClearHistoryChanged: function () {
+    let downloadsPref = document.getElementById("privacy.clearOnShutdown.downloads");
+    let historyPref = document.getElementById("privacy.clearOnShutdown.history");
+    downloadsPref.value = historyPref.value;
+  }
+});