chrome/content/ui/sidebar.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/sidebar.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/sidebar.js

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

index 580a2679c341d0ade26804d7c4a6249ab41ba665..6fde33008062785f82c88966ccf96a8caa86abbd 100644

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

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

@@ -1094,7 +1094,7 @@ var treeView = {

// Show disabled filters if no other filter applies

if (!item.filter)

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

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

if (!this.matchesFilter(item))

return;

@@ -1149,7 +1149,7 @@ var treeView = {

if (item.filter instanceof RegExpFilter && item.filter.disabled)

delete item.filter;

if (!item.filter)

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

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

}

this.refilter();