Issue 2664 - Remove ignoreHeaders argument from parseFilter(s) and move the logic to the UI

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 519 matching lines @@
     for (var i = 0; i < userFiltersBox.length; i++)
       text += userFiltersBox.options[i].value + "\n";
     document.getElementById("rawFiltersText").value = text;
   }
 }
 
 // Imports filters in the raw text box
 function importRawFiltersText()
 {
   var text = document.getElementById("rawFiltersText").value;
-  var result = parseFilters(text, true);
+  var result = parseFilters(text);
 
-  if (result.error)
+  var errors = [];
+  for (var i = 0; i < result.errors.length; i++)
   {
-    alert(result.error);
+    var error = result.errors[i];
+    if (error.type != "unexpected-filter-list-header")
+      errors.push(error);
+  }

[Wladimir Palant, 2015/06/08 18:15:47]

Why not:


  var errors = result.errors.filter(function(e)
  {
    return e.type != "unexpected-filter-list-header"
  });

[Sebastian Noack, 2015/06/08 18:36:46]

Done.

+
+  if (errors.length > 0)
+  {
+    alert(errors.join("\n"));
     return;
   }
 
   var seenFilter = Object.create(null);
   for (var i = 0; i < result.filters.length; i++)
   {
     var filter = result.filters[i];
     FilterStorage.addFilter(filter);
     seenFilter[filter.text] = null;
   }
@@ skipping 80 matching lines @@
       links[i].href = arguments[i + 1];
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof arguments[i + 1] == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", arguments[i + 1], false);
     }
   }
 }