Issue 3823 - Adapt message names used by "Block element" feature for consistency

blockElement.postload.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
@@ skipping 26 matching lines @@
 let lastRightClickEvent = null;
 let lastRightClickEventIsMostRecent = false;
 
 
 /* Utilities */
 
 function getFiltersForElement(element, callback)
 {
   ext.backgroundPage.sendMessage(
   {
-    type: "compose-filters",
+    type: "composer.getFilters",
     tagName: element.localName,
     id: element.id,
     src: element.getAttribute("src"),
     style: element.getAttribute("style"),
     classes: Array.prototype.slice.call(element.classList),
     urls: getURLsFromElement(element),
     mediatype: typeMap[element.localName],
     baseURL: document.location.href
   },
   response =>
@@ skipping 320 matching lines @@
     return;
 
   let element = currentElement.prisoner || currentElement;
   getFiltersForElement(element, (filters, selectors) =>
   {
     if (currentlyPickingElement)
       stopPickingElement();
 
     ext.backgroundPage.sendMessage(
     {
-      type: "blockelement-open-popup"
+      type: "composer.openDialog"
     },
     popupId =>
     {
       ext.backgroundPage.sendMessage(
       {
         type: "forward",
         targetPageId: popupId,
         payload:
         {
-          type: "blockelement-popup-init",
+          type: "composer.dialog.init",
           filters: 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(
         {
           type: "forward",
           payload:
           {
-            type: "blockelement-popup-opened",
+            type: "composer.content.dialogOpened",
             popupId: popupId
           }
         });
       }
     });
 
     if (selectors.length > 0)
       highlightElements(selectors.join(","));
 
     highlightElement(currentElement, "#fd1708", "#f6a1b5");
@@ skipping 28 matching lines @@
     stopPickingElement();
 
   if (blockelementPopupId != null)
   {
     ext.backgroundPage.sendMessage(
     {
       type: "forward",
       targetPageId: blockelementPopupId,
       payload:
       {
-        type: "blockelement-close-popup"
+        type: "composer.dialog.close"
       }
     });
 
     blockelementPopupId = null;
   }
 
   lastRightClickEvent = null;
 
   if (currentElement)
   {
@@ skipping 25 matching lines @@
   document.addEventListener("contextmenu", event =>
   {
     lastRightClickEvent = event;
     lastRightClickEventIsMostRecent = true;
 
     ext.backgroundPage.sendMessage(
     {
       type: "forward",
       payload:
       {
-        type: "blockelement-clear-previous-right-click-event"
+        type: "composer.content.clearPreviousRightClickEvent"
       }
     });
   }, true);
 
   ext.onMessage.addListener((msg, sender, sendResponse) =>
   {
     switch (msg.type)
     {
-      case "blockelement-get-state":
+      case "composer.content.getState":
         if (window == window.top)
           sendResponse({
             active: currentlyPickingElement || blockelementPopupId != null
           });
         break;
-      case "blockelement-start-picking-element":
+      case "composer.content.startPickingElement":
         if (window == window.top)
           startPickingElement();
         break;
-      case "blockelement-context-menu-clicked":
+      case "composer.content.contextMenuClicked":
         let event = lastRightClickEvent;
         deactivateBlockElement();
         if (event)
         {
           getBlockableElementOrAncestor(event.target, element =>
           {
             if (element)
             {
               currentElement = element;
               elementPicked(event);
             }
           });
         }
         break;
-      case "blockelement-finished":
+      case "composer.content.finished":
         if (currentElement && msg.remove)
         {
           // Hide the selected element itself if an added blocking
           // filter is causing it to collapse. Note that this
           // behavior is incomplete, but the best we can do here,
           // e.g. if an added blocking filter matches other elements,
           // the effect won't be visible until the page is is reloaded.
           checkCollapse(currentElement.prisoner || currentElement);
 
           // Apply added element hiding filters.
           updateStylesheet();
         }
         deactivateBlockElement();
         break;
-      case "blockelement-clear-previous-right-click-event":
+      case "composer.content.clearPreviousRightClickEvent":
         if (!lastRightClickEventIsMostRecent)
           lastRightClickEvent = null;
         lastRightClickEventIsMostRecent = false;
         break;
-      case "blockelement-popup-opened":
+      case "composer.content.dialogOpened":
         if (window == window.top)
           blockelementPopupId = msg.popupId;
         break;
-      case "blockelement-popup-closed":
+      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(
           {
             type: "forward",
             payload:
             {
-              type: "blockelement-finished"
+              type: "composer.content.finished"
             }
           });
         }
         break;
     }
   });
 
   if (window == window.top)
-    ext.backgroundPage.sendMessage({type: "report-html-page"});
+    ext.backgroundPage.sendMessage({type: "composer.ready"});
 }