chrome/content/ui/sendReport.js - Issue 29321478: Issue 2738 - Make RegExpFilter.matches() take a bit mask instead of content type string

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: chrome/content/ui/sendReport.js

Issue 29321478: Issue 2738 - Make RegExpFilter.matches() take a bit mask instead of content type string (Closed)

Patch Set: Created July 9, 2015, 1:45 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: chrome/content/ui/sendReport.js

diff --git a/chrome/content/ui/sendReport.js b/chrome/content/ui/sendReport.js

index ef3e8d14c1394bd8613d60d558ac5fcb59a4adb2..02564582a83039ed14a885439cfbadfce87ec98d 100644

--- a/chrome/content/ui/sendReport.js

+++ b/chrome/content/ui/sendReport.js

@@ -927,7 +927,7 @@ let issuesDataSource =

if (request.filter)

continue;

- let filter = disabledMatcher.matchesAny(request.location, request.typeDescr, request.docDomain, request.thirdParty);

+ let filter = disabledMatcher.matchesAny(request.location, RegExpFilter.toTypeMask(request.typeDescr), request.docDomain, request.thirdParty);

if (filter && !(filter.text in seenFilters))

{

this.disabledFilters.push(filter);

@@ -952,7 +952,7 @@ let issuesDataSource =

if (request.filter)

continue;

- let filter = disabledMatcher.matchesAny(request.location, request.typeDescr, request.docDomain, request.thirdParty);

+ let filter = disabledMatcher.matchesAny(request.location, RegExpFilter.toTypeMask(request.typeDescr), request.docDomain, request.thirdParty);

if (filter && !(subscription.url in seenSubscriptions))

{

this.disabledSubscriptions.push(subscription);