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

Unified Diff: lib/notification.js

Issue 29339343: Noissue - Removed redundant URL compatibility logic (Closed)
Patch Set: Use hostname Created April 4, 2016, 2:04 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 | lib/synchronizer.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/notification.js
===================================================================
--- a/lib/notification.js
+++ b/lib/notification.js
@@ -220,20 +220,15 @@
if (Prefs.enabled && typeof url === "string" && notification.urlFilters instanceof Array)
{
let host;
- if (typeof URL == "function")
+ try
+ {
host = new URL(url).hostname;
Sebastian Noack 2016/04/04 14:05:39 Sorry, I missed that. Before we used the hostname
- else
+ }
+ catch (e)
{
- try
- {
- host = Services.io.newURI(url, null, null).host;
- }
- catch (e)
- {
- // Ignore, an exception is expected for about: and similar schemes
- host = "";
- }
+ host = "";
}
+
let exception = defaultMatcher.matchesAny(url, RegExpFilter.typeMap.DOCUMENT, host, false, null);
if (exception instanceof WhitelistFilter)
continue;
« no previous file with comments | « no previous file | lib/synchronizer.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld