From fa764a68de13dcdaf863a1fdf7bc86c1856bb792 Mon Sep 17 00:00:00 2001 From: JustOff Date: Mon, 3 Sep 2018 23:27:30 +0300 Subject: Use the default value from 'browser.startup.homepage' instead of the hardcoded 'http://start.palemoon.org/' --- application/palemoon/components/preferences/newtaburl.js | 4 +++- application/palemoon/components/preferences/tabs.js | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'application/palemoon/components') 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: -- cgit v1.2.3