diff options
author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-03-26 11:01:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-26 11:01:15 +0100 |
commit | 55d249557f6002ffab38eaeb4fd650a5189ccde7 (patch) | |
tree | 9175f4663414be020075b0a4361476890aeb8070 /application/palemoon/components/preferences/tabs.js | |
parent | aa816b3d848d38c83204c3dd1a1d0b86013978b4 (diff) | |
parent | d72bcc92f52ce476184003a78b36ee40d2c1c875 (diff) | |
download | UXP-55d249557f6002ffab38eaeb4fd650a5189ccde7.tar UXP-55d249557f6002ffab38eaeb4fd650a5189ccde7.tar.gz UXP-55d249557f6002ffab38eaeb4fd650a5189ccde7.tar.lz UXP-55d249557f6002ffab38eaeb4fd650a5189ccde7.tar.xz UXP-55d249557f6002ffab38eaeb4fd650a5189ccde7.zip |
Merge pull request #1027 from JustOff/PR_newtab_choice
Prevent mistaken overwriting of browser.newtab.url when using the browser preferences dialog
Diffstat (limited to 'application/palemoon/components/preferences/tabs.js')
-rw-r--r-- | application/palemoon/components/preferences/tabs.js | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/application/palemoon/components/preferences/tabs.js b/application/palemoon/components/preferences/tabs.js index 17084a770..b09cb60df 100644 --- a/application/palemoon/components/preferences/tabs.js +++ b/application/palemoon/components/preferences/tabs.js @@ -78,34 +78,13 @@ var gTabsPane = { /** * Determines the value of the New Tab display drop-down based * on the value of browser.newtab.url. - * - * @returns the appropriate value of browser.newtab.choice */ readNewtabUrl: function() { - 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 defaultStartupHomepage: - newtabUrlChoice.value = 2; - break; - case newtabUrlSanitizedPref.value: - newtabUrlChoice.value = 3; - break; - case "about:newtab": - newtabUrlChoice.value = 4; - break; - default: // Custom URL entered. - document.getElementById("newtabPageCustom").hidden = false; - newtabUrlChoice.value = 0; - // We need this to consider instantApply. - this.newtabPageCustom = newtabUrlPref.value; + newtabUrlChoice.value = gNewtabUrl.getNewtabChoice(); + if (newtabUrlChoice.value == 0) { + document.getElementById("newtabPageCustom").hidden = false; } + gNewtabUrl.newtabUrlChoiceIsSet = true; } }; |