Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: background.js

Issue 29321198: Issue 2376 - Implement custom filters in new options page (Closed)
Patch Set: Addressed comments, moved error message to background page for consistency Created July 9, 2015, 4:25 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | locale/en-US/options.json » ('j') | messageResponder.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: background.js
===================================================================
--- a/background.js
+++ b/background.js
@@ -146,13 +146,38 @@
{
this.text = text;
this.disabled = false;
+ },
+ WhitelistFilter: function(text)
+ {
+ modules.filterClasses.Filter.call(this, text);
}
};
modules.filterClasses.Filter.fromText = function(text)
{
+ if (text.indexOf("@@") == 0)
+ return new modules.filterClasses.WhitelistFilter(text);
return new modules.filterClasses.Filter(text);
};
+ modules.filterValidation =
+ {
+ parseFilter: function(text)
+ {
+ return {filter: modules.filterClasses.Filter.fromText(text)};
+ },
+ parseFilters: function(text)
+ {
+ var lines = text.split("\n");
+ var filters = [];
+ var errors = [];
+
+ for (var i = 0; i < lines.length; i++)
+ filters.push(modules.filterValidation.parseFilter(lines[i]).filter);
+
+ return {filters: filters, errors: errors};
+ }
+ };
+
modules.synchronizer = {
Synchronizer: {}
};
@@ -221,7 +246,23 @@
"@@||alternate.de^$document",
"@@||der.postillion.com^$document",
"@@||taz.de^$document",
- "@@||amazon.de^$document"
+ "@@||amazon.de^$document",
+ "||biglemon.am/bg_poster/banner.jpg",
+ "winfuture.de###header_logo_link",
+ "###WerbungObenRechts10_GesamtDIV",
+ "###WerbungObenRechts8_GesamtDIV",
+ "###WerbungObenRechts9_GesamtDIV",
+ "###WerbungUntenLinks4_GesamtDIV",
+ "###WerbungUntenLinks7_GesamtDIV",
+ "###WerbungUntenLinks8_GesamtDIV",
+ "###WerbungUntenLinks9_GesamtDIV",
+ "###Werbung_Sky",
+ "###Werbung_Wide",
+ "###__ligatus_placeholder__",
+ "###ad-bereich1-08",
+ "###ad-bereich1-superbanner",
+ "###ad-bereich2-08",
+ "###ad-bereich2-skyscrapper"
];
var knownFilters = filters.map(modules.filterClasses.Filter.fromText);
« no previous file with comments | « no previous file | locale/en-US/options.json » ('j') | messageResponder.js » ('J')

Powered by Google App Engine
This is Rietveld