Bug 1361969 - Update the URL of "Firefox Support" Link draft
authorEvan Tseng <evan@tseng.io>
Thu, 04 May 2017 22:34:46 +0800
changeset 573040 afd30758af5a8a6b503144f710ba82eb681998d1
parent 572425 4a6a71f4aa22e4dc3961884ce505ce34bdd799a2
child 627211 b457e21e4d737b7199b8d4178ca4a78c021f8083
push id57286
push userbmo:evan@tseng.io
push dateFri, 05 May 2017 08:56:42 +0000
bugs1361969
milestone55.0a1
Bug 1361969 - Update the URL of "Firefox Support" Link MozReview-Commit-ID: 1aBPa6Pv9Fs
browser/components/preferences/in-content/preferences.js
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -81,16 +81,20 @@ function init_all() {
   init_dynamic_padding();
 
   var initFinished = new CustomEvent("Initialized", {
     "bubbles": true,
     "cancelable": true
   });
   document.dispatchEvent(initFinished);
 
+  let helpButton = document.querySelector(".help-button");
+  let helpUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "preferences";
+  helpButton.setAttribute("href", helpUrl);
+
   // Wait until initialization of all preferences are complete before
   // notifying observers that the UI is now ready.
   Services.obs.notifyObservers(window, "advanced-pane-loaded");
 }
 
 // Make the space above the categories list shrink on low window heights
 function init_dynamic_padding() {
   let categories = document.getElementById("categories");
@@ -164,19 +168,16 @@ function gotoPref(aCategory) {
   if (gLastHash == category && !subcategory)
     return;
   let item = categories.querySelector(".category[value=" + category + "]");
   if (!item) {
     category = kDefaultCategoryInternalName;
     item = categories.querySelector(".category[value=" + category + "]");
   }
 
-  let helpButton = document.querySelector(".help-button");
-  helpButton.setAttribute("href", getHelpLinkURL(item.getAttribute("helpTopic")));
-
   try {
     init_category_if_required(category);
   } catch (ex) {
     Cu.reportError("Error initializing preference category " + category + ": " + ex);
     throw ex;
   }
 
   let friendlyName = internalPrefCategoryNameToFriendlyName(category);