Issue 4871 - Start using ESLint for adblockplusui

new-options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /* globals checkShareResource, getDocLink, i18nFormatDateTime, openSharePopup,
            E */
 
 "use strict";
 
 {
   let subscriptionsMap = Object.create(null);
   let filtersMap = Object.create(null);
   let collections = Object.create(null);
   let acceptableAdsUrl = null;
   let {getMessage} = ext.i18n;
   let filterErrors = new Map([

[Thomas Greiner, 2017/03/01 17:39:35]

Why do you use `Map` here but not in messageResponder.js for `messageTypes`?

[kzar, 2017/03/07 12:48:32]

Well I changed this one since it helped fix some long lines. But you're right we
should really change the other one too. Done.

     ["synchronize_invalid_url",
      "options_filterList_lastDownload_invalidURL"],
     ["synchronize_connection_error",
      "options_filterList_lastDownload_connectionError"],
     ["synchronize_invalid_data",
      "options_filterList_lastDownload_invalidData"],
     ["synchronize_checksum_mismatch",
      "options_filterList_lastDownload_checksumMismatch"]
   ]);
 
@@ skipping 345 matching lines @@
     }
     else
       collections.customFilters.addItem(filter);
 
     filtersMap[filter.text] = filter;
   }
 
   function loadRecommendations()
   {
     fetch("subscriptions.xml")
-      .then(response =>
+      .then((response) =>
       {
         return response.text();
       })
-      .then(text =>
+      .then((text) =>
       {
         let doc = new DOMParser().parseFromString(text, "application/xml");
         let elements = doc.documentElement.getElementsByTagName("subscription");
         for (let element of elements)
         {
           let type = element.getAttribute("type");
           let subscription = {
             disabled: true,
             downloadStatus: null,
             homepage: null,
@@ skipping 31 matching lines @@
         return element.getAttribute("data-" + dataName);
       }
 
       element = element.parentElement;
     }
     return null;
   }
 
   function sendMessageHandleErrors(message, onSuccess)
   {
-    ext.backgroundPage.sendMessage(message, errors =>
+    ext.backgroundPage.sendMessage(message, (errors) =>
     {
       if (errors.length > 0)
         alert(errors.join("\n"));
       else if (onSuccess)
         onSuccess();
     });
   }
 
   function openDocLink(id)
   {
-    getDocLink(id, link =>
+    getDocLink(id, (link) =>
     {
       if (id == "share-general")
         openSharePopup(link);
       else
         location.href = link;
     });
   }
 
   function switchTab(id)
   {
@@ skipping 24 matching lines @@
           let url = dialog.querySelector(".url").textContent;
           addEnableSubscription(url, title);
           closeDialog();
           break;
         }
         case "cancel-custom-filters":
           E("custom-filters").classList.remove("mode-edit");
           break;
         case "cancel-domain-exception":
           E("whitelisting-textbox").value = "";
-          document.querySelector("#whitelisting .controls").classList.
-            remove("mode-edit");
+          document.querySelector("#whitelisting .controls").classList
+            .remove("mode-edit");
           break;
         case "close-dialog":
           closeDialog();
           break;
         case "edit-custom-filters":
           E("custom-filters").classList.add("mode-edit");
           editCustomFilters();
           break;
         case "edit-domain-exception":
-          document.querySelector("#whitelisting .controls").classList.
-            add("mode-edit");
+          document.querySelector("#whitelisting .controls").classList
+            .add("mode-edit");
           E("whitelisting-textbox").focus();
           break;
         case "import-subscription": {
           let url = E("blockingList-textbox").value;
           addEnableSubscription(url);
           closeDialog();
           break;
         }
         case "open-dialog": {
           let dialog = findParentData(element, "dialog", false);
@@ skipping 212 matching lines @@
         searchStyle.innerHTML = "#all-lang-table li:not([data-search*=\"" +
           this.value.toLowerCase() + "\"]) { display: none; }";
       }
     }
 
     // Initialize navigation sidebar
     ext.backgroundPage.sendMessage({
       type: "app.get",
       what: "addonVersion"
     },
-    addonVersion =>

[Thomas Greiner, 2017/03/01 17:39:35]

This being on the same level as the function calls above and below makes it look
quite confusing. Is this really the way we intended indentation to behave?

[kzar, 2017/03/02 04:36:01]

Yes, I think this is how we're expecting the indentation to look. Perhaps if I
add a blank line in between it will help.

[Thomas Greiner, 2017/03/07 13:33:01]

Nah, because the issue is that putting it in the same line makes it look like
its own statement and separating them even further would only strengthen that
confusion, I'd argue.

Anyway, if this is how it's supposed to be I won't stand in the way.

[kzar, 2017/03/08 10:29:32]

Acknowledged.

+    (addonVersion) =>
     {
       E("abp-version").textContent = addonVersion;
     });
-    getDocLink("releases", link =>
+    getDocLink("releases", (link) =>
     {
       E("link-version").setAttribute("href", link);
     });
 
     updateShareLink();
     updateTooltips();
 
     // Initialize interactive UI elements
     document.body.addEventListener("click", onClick, false);
     document.body.addEventListener("keyup", onKeyUp, false);
     let placeholderValue = getMessage("options_dialog_language_find");
     E("find-language").setAttribute("placeholder", placeholderValue);
     E("find-language").addEventListener("keyup", onFindLanguageKeyUp, false);
-    E("whitelisting-textbox").addEventListener("keypress", e =>
+    E("whitelisting-textbox").addEventListener("keypress", (e) =>
     {
       if (getKey(e) == "Enter")
         addWhitelistedDomain();
     }, false);
 
     // Advanced tab
     let tweaks = document.querySelectorAll("#tweaks li[data-pref]");
-    tweaks = Array.prototype.map.call(tweaks, checkbox =>
+    tweaks = Array.prototype.map.call(tweaks, (checkbox) =>
     {
       return checkbox.getAttribute("data-pref");
     });
     for (let key of tweaks)
     {
-      getPref(key, value =>
+      getPref(key, (value) =>
       {
         onPrefMessage(key, value, true);
       });
     }
     ext.backgroundPage.sendMessage({
       type: "app.get",
       what: "features"
     },
-    features =>
+    (features) =>
     {
       hidePref("show_devtools_panel", !features.devToolsPanel);
     });
 
     let filterTextbox = document.querySelector("#custom-filters-add input");
     placeholderValue = getMessage("options_customFilters_textbox_placeholder");
     filterTextbox.setAttribute("placeholder", placeholderValue);
     function addCustomFilters()
     {
       let filterText = filterTextbox.value;
       sendMessageHandleErrors({
         type: "filters.add",
         text: filterText
       },
       () =>
       {
         filterTextbox.value = "";
       });
     }
-    E("custom-filters-add").addEventListener("submit", e =>
+    E("custom-filters-add").addEventListener("submit", (e) =>
     {
       e.preventDefault();
       addCustomFilters();
     }, false);
+
+    // Help tab
+    getDocLink("faq", (link) =>
+    {
+      E("link-faq").setAttribute("href", link);
+    });
+    getDocLink("social_twitter", (link) =>
+    {
+      E("link-twitter").setAttribute("href", link);
+    });
+    getDocLink("social_facebook", (link) =>
+    {
+      E("link-facebook").setAttribute("href", link);
+    });
+    getDocLink("social_gplus", (link) =>
+    {
+      E("link-gplus").setAttribute("href", link);
+    });
+    getDocLink("social_renren", (link) =>
+    {
+      E("link-renren").setAttribute("href", link);
+    });
+    getDocLink("social_weibo", (link) =>
+    {
+      E("link-weibo").setAttribute("href", link);
+    });
+
+    // Set forum link
+    ext.backgroundPage.sendMessage({
+      type: "app.get",
+      what: "platform"
+    },
+    (platform) =>
+    {
+      ext.backgroundPage.sendMessage({
+        type: "app.get",
+        what: "application"
+      },
+      (application) =>
+      {
+        if (platform == "chromium" && application != "opera")
+          application = "chrome";
+
+        getDocLink(application + "_support", (link) =>
+        {
+          E("link-forum").setAttribute("href", link);
+        });
+      });
+    });
 
     E("dialog").addEventListener("keydown", function(e)
     {
       switch (getKey(e))
       {
         case "Escape":
           closeDialog();
           break;
         case "Tab":
           if (e.shiftKey)
@@ skipping 48 matching lines @@
     filtersMap = Object.create(null);
 
     // Empty collections and lists
     for (let property in collections)
       collections[property].clearAll();
 
     ext.backgroundPage.sendMessage({
       type: "subscriptions.get",
       special: true
     },
-    subscriptions =>
+    (subscriptions) =>
     {
       // Load filters
       for (let subscription of subscriptions)
       {
         ext.backgroundPage.sendMessage({
           type: "filters.get",
           subscriptionUrl: subscription.url
         },
-        filters =>
+        (filters) =>
         {
           for (let filter of filters)
             updateFilter(filter);
         });
       }
     });
     loadRecommendations();
     ext.backgroundPage.sendMessage({
       type: "prefs.get",
       key: "subscriptions_exceptionsurl"
     },
-    url =>
+    (url) =>
     {
       acceptableAdsUrl = url;
       addSubscription({
         url: acceptableAdsUrl,
         disabled: true
       });
 
       // Load user subscriptions
       ext.backgroundPage.sendMessage({
         type: "subscriptions.get",
         downloadable: true
       },
-      subscriptions =>
+      (subscriptions) =>
       {
         for (let subscription of subscriptions)
           onSubscriptionMessage("added", subscription);
       });
     });
   }
 
   function addWhitelistedDomain()
   {
     let domain = E("whitelisting-textbox");
     if (domain.value)
     {
       sendMessageHandleErrors({
         type: "filters.add",
         text: "@@||" + domain.value.toLowerCase() + "^$document"
       });
     }
 
     domain.value = "";
-    document.querySelector("#whitelisting .controls").
-      classList.remove("mode-edit");
+    document.querySelector("#whitelisting .controls")
+      .classList.remove("mode-edit");
   }
 
   function editCustomFilters()
   {
     let filterTexts = [];
     for (let customFilterItem of collections.customFilters.items)
       filterTexts.push(customFilterItem.text);
     E("custom-filters-raw").value = filterTexts.join("\n");
   }
 
@@ skipping 94 matching lines @@
   function hidePref(key, value)
   {
     let element = document.querySelector("[data-pref='" + key + "']");
     if (element)
       element.setAttribute("aria-hidden", value);
   }
 
   function getPref(key, callback)
   {
     let checkPref = getPref.checks[key] || getPref.checkNone;
-    checkPref(isActive =>
+    checkPref((isActive) =>
     {
       if (!isActive)
       {
         hidePref(key, !isActive);
         return;
       }
 
       ext.backgroundPage.sendMessage({
         type: "prefs.get",
         key
@@ skipping 128 matching lines @@
           paragraph.innerHTML = bottomText;
           notes.appendChild(paragraph);
         }
         tooltip.appendChild(notes);
       }
 
       wrapper.appendChild(tooltip);
     }
   }
 
-  ext.onMessage.addListener(message =>
+  ext.onMessage.addListener((message) =>
   {
     switch (message.type)
     {
       case "app.respond":
         switch (message.action)
         {
           case "addSubscription":
             let subscription = message.args[0];
             let dialog = E("dialog-content-predefined");
             dialog.querySelector("h3").textContent = subscription.title || "";
@@ skipping 32 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);
 }