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

popup.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 30 matching lines @@
 
     // Ask content script whether clickhide is active. If so, show cancel button.
     // If that isn't the case, ask background.html whether it has cached filters. If so,
     // ask the user whether she wants those filters.
     // Otherwise, we are in default state.
     if (page)
     {
       if (checkWhitelisted(page))
         document.body.classList.add("disabled");
 
-      page.sendMessage({type: "blockelement-get-state"}, function(response)
+      page.sendMessage({type: "composer.content.getState"}, function(response)
       {
         if (response && response.active)
           document.body.classList.add("clickhide-active");
       });
     }
   });
 
   // Attach event listeners
   ext.onMessage.addListener(onMessage);
   document.getElementById("enabled").addEventListener("click", toggleEnabled, false);
@@ skipping 15 matching lines @@
   }
 }
 
 function onUnload()
 {
   ext.onMessage.removeListener(onMessage);
 }
 
 function onMessage(message, sender, callback)
 {
-  if (message.type == "report-html-page" && sender.page.id == page.id)
+  if (message.type == "composer.ready" && sender.page.id == page.id)
     document.body.classList.remove("nohtml");
 }
 
 function toggleEnabled()
 {
   var disabled = document.body.classList.toggle("disabled");
   if (disabled)
   {
     var host = getDecodedHostname(page.url).replace(/^www\./, "");
     var filter = Filter.fromText("@@||" + host + "^$document");
@@ skipping 15 matching lines @@
       if (filter.subscriptions.length)
         filter.disabled = true;
       filter = checkWhitelisted(page);
     }
   }
 }
 
 function activateClickHide()
 {
   document.body.classList.add("clickhide-active");
-  page.sendMessage({type: "blockelement-start-picking-element"});
+  page.sendMessage({type: "composer.content.startPickingElement"});
 
   // Close the popup after a few seconds, so user doesn't have to
   activateClickHide.timeout = window.setTimeout(ext.closePopup, 5000);
 }
 
 function cancelClickHide()
 {
   if (activateClickHide.timeout)
   {
     window.clearTimeout(activateClickHide.timeout);
     activateClickHide.timeout = null;
   }
   document.body.classList.remove("clickhide-active");
-  page.sendMessage({type: "blockelement-finished"});
+  page.sendMessage({type: "composer.content.finished"});
 }
 
 function toggleCollapse(event)
 {
   var collapser = event.currentTarget;
   Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option];
   collapser.parentNode.classList.toggle("collapsed");
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);
 window.addEventListener("unload", onUnload, false);