summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-11-30 06:40:10 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-11-30 06:40:10 +0100
commit9a673b996e26c5dfe6c0e951a7a91782a678a079 (patch)
tree80aaab7512a6f3e34a2e00f16ecaeda6801bbaeb
parent088c3cf890cc2d96f2093e2116612cbf65bfaeea (diff)
parentda447504ddabd5519d9952f79f6bad954eba60e6 (diff)
downloadUXP-9a673b996e26c5dfe6c0e951a7a91782a678a079.tar
UXP-9a673b996e26c5dfe6c0e951a7a91782a678a079.tar.gz
UXP-9a673b996e26c5dfe6c0e951a7a91782a678a079.tar.lz
UXP-9a673b996e26c5dfe6c0e951a7a91782a678a079.tar.xz
UXP-9a673b996e26c5dfe6c0e951a7a91782a678a079.zip
Merge branch 'master' into Sync-weave
-rw-r--r--application/palemoon/app/profile/palemoon.js6
-rw-r--r--application/palemoon/base/content/sanitize.js24
-rw-r--r--modules/libpref/init/all.js2
3 files changed, 11 insertions, 21 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index e53b1693b..69f8f6651 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -229,10 +229,10 @@ pref("keyword.enabled", true);
pref("general.useragent.locale", "@AB_CD@");
pref("general.skins.selectedSkin", "classic/1.0");
-// Native UA mode by default
+// Native UA mode by default for unbranded
pref("general.useragent.compatMode", 0);
-pref("general.useragent.compatmode.gecko", false);
-pref("general.useragent.compatmode.firefox", false);
+pref("general.useragent.compatMode.gecko", false);
+pref("general.useragent.compatMode.firefox", false);
pref("general.smoothScroll", true);
#ifdef UNIX_BUT_NOT_MAC
diff --git a/application/palemoon/base/content/sanitize.js b/application/palemoon/base/content/sanitize.js
index 0c85fa215..b4d13d895 100644
--- a/application/palemoon/base/content/sanitize.js
+++ b/application/palemoon/base/content/sanitize.js
@@ -257,18 +257,13 @@ Sanitizer.prototype = {
.getService(Components.interfaces.nsIWindowMediator);
var windows = windowManager.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
- let currentWindow = windows.getNext();
- let currentDocument = currentWindow.document;
+ let currentDocument = windows.getNext().document;
let searchBar = currentDocument.getElementById("searchbar");
if (searchBar)
searchBar.textbox.reset();
- let tabBrowser = currentWindow.gBrowser;
- for (let tab of tabBrowser.tabs) {
- if (tabBrowser.isFindBarInitialized(tab))
- tabBrowser.getFindBar(tab).clear();
- }
- // Clear any saved find value
- tabBrowser._lastFindValue = "";
+ let findBar = currentDocument.getElementById("FindToolbar");
+ if (findBar)
+ findBar.clear();
}
let change = { op: "remove" };
@@ -284,8 +279,7 @@ Sanitizer.prototype = {
.getService(Components.interfaces.nsIWindowMediator);
var windows = windowManager.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
- let currentWindow = windows.getNext();
- let currentDocument = currentWindow.document;
+ let currentDocument = windows.getNext().document;
let searchBar = currentDocument.getElementById("searchbar");
if (searchBar) {
let transactionMgr = searchBar.textbox.editor.transactionManager;
@@ -296,12 +290,8 @@ Sanitizer.prototype = {
return false;
}
}
- let tabBrowser = currentWindow.gBrowser;
- let findBarCanClear = Array.some(tabBrowser.tabs, function (aTab) {
- return tabBrowser.isFindBarInitialized(aTab) &&
- tabBrowser.getFindBar(aTab).canClear;
- });
- if (findBarCanClear) {
+ let findBar = currentDocument.getElementById("FindToolbar");
+ if (findBar && findBar.canClear) {
aCallback("formdata", true, aArg);
return false;
}
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 3fce0f486..546c836f0 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5245,7 +5245,7 @@ pref("browser.search.official", true);
//pref("media.gmp-manager.url.override", "");
// Update service URL for GMP install/updates:
-pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/55.0/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
+pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/60.0/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
// When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the
// final certificate and all certificates the connection is redirected to before