Issue 4864 - Start using ESLint for adblockpluschrome

composer.postload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 checkCollapse, elemhide, getURLsFromElement, typeMap */
+
 "use strict";
 
 // The page ID for the popup filter selection dialog (top frame only).
 let blockelementPopupId = null;
 
 // Element picking state (top frame only).
 let currentlyPickingElement = false;
 let lastMouseOverEvent = null;
 
 // During element picking this is the currently highlighted element. When
 // element has been picked this is the element that is due to be blocked.
 let currentElement = null;
 
 // Highlighting state, used by the top frame during element picking and all
 // frames when the chosen element is highlighted red.
 let highlightedElementsSelector = null;
 let highlightedElementsInterval = null;
 
 // Last right click state stored for element blocking via the context menu.
 let lastRightClickEvent = null;
 let lastRightClickEventIsMostRecent = false;
 
 
 /* Utilities */
 
 function getFiltersForElement(element, callback)
 {
   let src = element.getAttribute("src");
-  ext.backgroundPage.sendMessage(
-  {
+  ext.backgroundPage.sendMessage({
     type: "composer.getFilters",
     tagName: element.localName,
     id: element.id,
     src: src && src.length <= 1000 ? src : null,
     style: element.getAttribute("style"),
     classes: Array.prototype.slice.call(element.classList),
     urls: getURLsFromElement(element),
-    mediatype: typeMap[element.localName],
+    mediatype: typeMap.get(element.localName),
     baseURL: document.location.href
   },
   response =>
   {
     callback(response.filters, response.selectors);
   });
 }
 
 function getBlockableElementOrAncestor(element, callback)
 {
@@ skipping 315 matching lines @@
 {
   if (!currentElement)
     return;
 
   let element = currentElement.prisoner || currentElement;
   getFiltersForElement(element, (filters, selectors) =>
   {
     if (currentlyPickingElement)
       stopPickingElement();
 
-    ext.backgroundPage.sendMessage(
-    {
+    ext.backgroundPage.sendMessage({
       type: "composer.openDialog"
     },
     popupId =>
     {
-      ext.backgroundPage.sendMessage(
-      {
+      ext.backgroundPage.sendMessage({
         type: "forward",
         targetPageId: popupId,
-        payload:
-        {
-          type: "composer.dialog.init",
-          filters: filters
-        }
+        payload: {type: "composer.dialog.init", filters}
       });
 
       // Only the top frame keeps a record of the popup window's ID,
       // so if this isn't the top frame we need to pass the ID on.
       if (window == window.top)
       {
         blockelementPopupId = popupId;
       }
       else
       {
-        ext.backgroundPage.sendMessage(
-        {
+        ext.backgroundPage.sendMessage({
           type: "forward",
-          payload:
-          {
-            type: "composer.content.dialogOpened",
-            popupId: popupId
-          }
+          payload: {type: "composer.content.dialogOpened", popupId}
         });
       }
     });
 
     if (selectors.length > 0)
       highlightElements(selectors.join(","));
 
     highlightElement(currentElement, "#fd1708", "#f6a1b5");
   });
 
@@ skipping 20 matching lines @@
 /* Core logic */
 
 // We're done with the block element feature for now, tidy everything up.
 function deactivateBlockElement()
 {
   if (currentlyPickingElement)
     stopPickingElement();
 
   if (blockelementPopupId != null)
   {
-    ext.backgroundPage.sendMessage(
-    {
+    ext.backgroundPage.sendMessage({
       type: "forward",
       targetPageId: blockelementPopupId,
       payload:
       {
         type: "composer.dialog.close"
       }
     });
 
     blockelementPopupId = null;
   }
@@ skipping 21 matching lines @@
   // this because the contextMenu API only provides a URL, not the actual DOM
   // element.
   //   We also need to make sure that the previous right click event,
   // if there is one, is removed. We don't know which frame it is in so we must
   // send a message to the other frames to clear their old right click events.
   document.addEventListener("contextmenu", event =>
   {
     lastRightClickEvent = event;
     lastRightClickEventIsMostRecent = true;
 
-    ext.backgroundPage.sendMessage(
-    {
+    ext.backgroundPage.sendMessage({
       type: "forward",
       payload:
       {
         type: "composer.content.clearPreviousRightClickEvent"
       }
     });
   }, true);
 
   ext.onMessage.addListener((msg, sender, sendResponse) =>
   {
     switch (msg.type)
     {
       case "composer.content.getState":
         if (window == window.top)
+        {

[Sebastian Noack, 2017/03/29 17:14:12]

Apparently we turned the "curly" rule off in the end, so changes like this are
unrelated and unnecessary now.

[kzar, 2017/03/30 07:20:43]

I've removed most of those unrelated curly changes, but I left the ones that are
consistent with our coding style guide. For example the braces are required here
since the block spans over multiple lines.

While technically not related to ESLint now it seems pretty pointless to change
them back to violate our style guide.

           sendResponse({
             active: currentlyPickingElement || blockelementPopupId != null
           });
+        }
         break;
       case "composer.content.startPickingElement":
         if (window == window.top)
           startPickingElement();
         break;
       case "composer.content.contextMenuClicked":
         let event = lastRightClickEvent;
         deactivateBlockElement();
         if (event)
         {
@@ skipping 29 matching lines @@
         break;
       case "composer.content.dialogOpened":
         if (window == window.top)
           blockelementPopupId = msg.popupId;
         break;
       case "composer.content.dialogClosed":
         // The onRemoved hook for the popup can create a race condition, so we
         // to be careful here. (This is not perfect, but best we can do.)
         if (window == window.top && blockelementPopupId == msg.popupId)
         {
-          ext.backgroundPage.sendMessage(
-          {
+          ext.backgroundPage.sendMessage({
             type: "forward",
             payload:
             {
               type: "composer.content.finished"
             }
           });
         }
         break;
     }
   });
 
   if (window == window.top)
     ext.backgroundPage.sendMessage({type: "composer.ready"});
 }