Issue 370 - Right-clicked element is removed independent of created filter

block.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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/>.
  */
 
 function init()
 {
   // Attach event listeners
   window.addEventListener("keydown", onKeyDown, false);
   window.addEventListener("dragstart", onDragStart, false);
   window.addEventListener("drag", onDrag, false);
   window.addEventListener("dragend", onDragEnd, false);
 
   $("#addButton").click(addFilters);
-  $("#cancelButton").click(closeDialog.bind(null, false));
+  $("#cancelButton").click(closeDialog.bind(null, null));
 
   // Apply jQuery UI styles
   $("button").button();
 
   ext.backgroundPage.sendMessage(
   {
     type: "forward",
     payload:
     {
       type: "clickhide-init",
       width: Math.max(document.body.offsetWidth || document.body.scrollWidth),
       height: Math.max(document.body.offsetHeight || document.body.scrollHeight)
     }
   },
   function(response)
   {
     document.getElementById("filters").value = response.filters.join("\n");
   });
 
   document.getElementById("filters").focus();
 }
 $(init);
 
 function onKeyDown(event)
 {
   if (event.keyCode == 27)
   {
     event.preventDefault();
-    closeDialog();
+    closeDialog(null);
   }
   else if (event.keyCode == 13 && !event.shiftKey && !event.ctrlKey)
   {
     event.preventDefault();
     addFilters();
   }
 }
 
 function addFilters()
 {
   // Tell the background page to add the filters
   var filters = document.getElementById("filters").value.split(/[\r\n]+/)
                         .map(function(f) {return f.replace(/^\s+/, "").replace(/\s+$/, "");})
                         .filter(function(f) {return f != "";});
   ext.backgroundPage.sendMessage({type: "add-filters", filters: filters});
-  closeDialog(true);
+  closeDialog(filters);
 }
 
-function closeDialog(success)
+function closeDialog(filters)
 {
   ext.backgroundPage.sendMessage(
     {
       type: "forward",
       payload:
       {
         type: "clickhide-close",
-        remove: (typeof success == "boolean" ? success : false)
+        filters: filters

[Wladimir Palant, 2014/01/10 16:28:56]

Why send the filters and have the other end ignore that parameter? IMHO all the
changes in this file are unnecessary. Also, respecting the remove parameter in
the content script makes sense to avoid wasting resources.

[Thomas Greiner, 2014/07/17 15:35:49]

You're right. This is code from earlier approaches.

       }
     }
   );
 }
 
 var dragCoords = null;
 function onDragStart(event)
 {
   dragCoords = [event.screenX, event.screenY];
 }
@@ skipping 22 matching lines @@
     );
     dragCoords = [event.screenX, event.screenY];
   }
 }
 
 function onDragEnd(event)
 {
   onDrag(event);
   dragCoords = null;
 }