Issue 5701 - Inconsistent forum links and DNT link

new-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 847 matching lines @@
     }, false);
 
     getDocLink("contribute", (link) =>
     {
       E("contribute").href = link;
     });
     getDocLink("acceptable_ads_criteria", (link) =>
     {
       setLinks("enable-aa-description", link);
     });
-
-    // Get platform specific links
-    Promise.all([getPromisedInfo("platform"), getPromisedInfo("application")])

[Sebastian Noack, 2017/09/25 16:12:48]

Perhaps it would be simpler to move this logic into messageResponder.js, so that
you don't have to send two messages in the first place.

[saroyanm, 2017/09/25 16:34:23]

I agree that sending two messages is not a good idea.
Done.

-      .then(([platform, application]) =>
-      {

[saroyanm, 2017/09/25 15:59:50]

I wonder if we need to check for the "gecko" and assign Firefox to it ?
Same way we assign chrome to all chromium platforms that are not "opera" ?

Considering the fact that application for the Edge browser is "edge" we
shouldn't have problem here I guess.

[Sebastian Noack, 2017/09/25 16:05:55]

That is an excellent idea. Though in practice it wouldn't be a problem right
now, as we don't show this link on Firefox Mobile, and there are no other Gecko
applications that support WebExtensions. But in case this changes in the future,
I think it would be a good idea to get the logic here right from the beginning.
Yes, application=edge is hard-coded in the Microsoft Edge builds, so no need to
explicitly handle this here.

[saroyanm, 2017/09/25 16:34:23]

Done.

-        if (platform == "chromium" && application != "opera")
-          application = "chrome";
-
-        getDocLink(application + "_support", url =>
-        {
-          setLinks("visit-forum", url);
-        });
-
-        getDocLink("adblock_plus_" + application + "_dnt", url =>
-        {
-          setLinks("dnt", url);
-        });
-      });
+    getDocLink("adblock_plus_{browser}_dnt", url =>
+    {
+      setLinks("dnt", url);
+    });
 
     // Advanced tab
     let customize = document.querySelectorAll("#customize li[data-pref]");
     customize = Array.prototype.map.call(customize, (checkbox) =>
     {
       return checkbox.getAttribute("data-pref");
     });
     for (let key of customize)
     {
       getPref(key, (value) =>
@@ skipping 28 matching lines @@
     {
       setLinks("report-issue", link);
     });
     getDocLink("adblock_plus_report_ad", (link) =>
     {
       setLinks("report-ad", link);
     });
     getDocLink("adblock_plus_report_bug", (link) =>
     {
       setLinks("report-bug", link);
+    });
+    getDocLink("{browser}_support", url =>
+    {
+      setLinks("visit-forum", url);
     });
     getDocLink("social_twitter", (link) =>
     {
       E("twitter").setAttribute("href", link);
     });
     getDocLink("social_facebook", (link) =>
     {
       E("facebook").setAttribute("href", link);
     });
     getDocLink("social_gplus", (link) =>
@@ skipping 103 matching lines @@
     {
       let subscription = subscriptionsMap[url];
       if (subscription.recommended == "privacy")
       {
         privacyList = subscription;
         break;
       }
     }
     return acceptableAdsList && acceptableAdsList.disabled == false &&
       privacyList && privacyList.disabled == false;
-  }
-
-  function getPromisedInfo(info)
-  {
-    return new Promise((resolve, reject) =>
-    {
-      ext.backgroundPage.sendMessage({
-        type: "app.get",
-        what: info
-      }, resolve);
-    });
   }
 
   function populateLists()
   {
     subscriptionsMap = Object.create(null);
     filtersMap = Object.create(null);
 
     // Empty collections and lists
     for (let property in collections)
       collections[property].clearAll();
@@ skipping 324 matching lines @@
   });
   ext.backgroundPage.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }