summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-09-03 23:27:30 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-09-03 23:27:30 +0300
commitfa764a68de13dcdaf863a1fdf7bc86c1856bb792 (patch)
tree3a7f40f6fb6a7470e009be0d9cab1dd8e3528f17
parent5359706e7ab5d164748786aa2fd040eca52ed5f3 (diff)
downloadUXP-fa764a68de13dcdaf863a1fdf7bc86c1856bb792.tar
UXP-fa764a68de13dcdaf863a1fdf7bc86c1856bb792.tar.gz
UXP-fa764a68de13dcdaf863a1fdf7bc86c1856bb792.tar.lz
UXP-fa764a68de13dcdaf863a1fdf7bc86c1856bb792.tar.xz
UXP-fa764a68de13dcdaf863a1fdf7bc86c1856bb792.zip
Use the default value from 'browser.startup.homepage' instead of the hardcoded 'http://start.palemoon.org/'
-rw-r--r--application/palemoon/components/preferences/newtaburl.js4
-rw-r--r--application/palemoon/components/preferences/tabs.js5
2 files changed, 7 insertions, 2 deletions
diff --git a/application/palemoon/components/preferences/newtaburl.js b/application/palemoon/components/preferences/newtaburl.js
index afe0b43fb..ac0eec1c5 100644
--- a/application/palemoon/components/preferences/newtaburl.js
+++ b/application/palemoon/components/preferences/newtaburl.js
@@ -42,7 +42,9 @@ var gNewtabUrl = {
newtabUrlPref = "about:logopage";
break;
case 2:
- newtabUrlPref = "http://start.palemoon.org/";
+ newtabUrlPref = Services.prefs.getDefaultBranch("browser.")
+ .getComplexValue("startup.homepage",
+ Components.interfaces.nsIPrefLocalizedString).data;
break;
case 3:
// If url is a pipe-delimited set of pages, just take the first one.
diff --git a/application/palemoon/components/preferences/tabs.js b/application/palemoon/components/preferences/tabs.js
index 4d57a29fb..17084a770 100644
--- a/application/palemoon/components/preferences/tabs.js
+++ b/application/palemoon/components/preferences/tabs.js
@@ -85,11 +85,14 @@ var gTabsPane = {
let newtabUrlPref = document.getElementById("browser.newtab.url");
let newtabUrlSanitizedPref = document.getElementById("browser.newtab.myhome");
let newtabUrlChoice = document.getElementById("browser.newtab.choice");
+ let defaultStartupHomepage = Services.prefs.getDefaultBranch("browser.")
+ .getComplexValue("startup.homepage",
+ Components.interfaces.nsIPrefLocalizedString).data;
switch (newtabUrlPref.value) {
case "about:logopage":
newtabUrlChoice.value = 1;
break;
- case "http://start.palemoon.org/":
+ case defaultStartupHomepage:
newtabUrlChoice.value = 2;
break;
case newtabUrlSanitizedPref.value: