Issue 491 - Validate custom filters

block.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 46 matching lines @@
   }
   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
+      text: document.getElementById("filters").value
     },
 
     function(response)
     {
       if (response.status == "ok")
         closeDialog(true);
       else
         alert(response.error);

[Wladimir Palant, 2014/11/18 16:35:03]

I don't think this message is helpful without indicating which filter it applies
to. Besides, showing the browser's error message in addition to our generic
description would be nice.

[Sebastian Noack, 2014/11/18 17:42:55]

I decided to keep things as simple as possible for now, since we are probably
going to rework the UI anyway. And at the moment any error message is better
than no error message.

Also the browser's error message is as generic as our error message, at least on
Chrome and Safari, though it mentions the selector. However, for other cases of
InvalidFilter there won't even be a browser error.

But I guess we can add the line number at least.

     }
   );
 }
 
 function closeDialog(success)
 {
   ext.backgroundPage.sendMessage(
     {
       type: "forward",
       payload:
@@ skipping 35 matching lines @@
     );
     dragCoords = [event.screenX, event.screenY];
   }
 }
 
 function onDragEnd(event)
 {
   onDrag(event);
   dragCoords = null;
 }