chrome/content/ui/composer.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/composer.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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/content/ui/composer.js

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

index d4e1f1633894671f562b4945e8d2243680c2f8ba..7e212504f2760c05b3a0d7f6ef15be33afc91fe9 100644

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

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

@@ -279,7 +279,7 @@ function updateFilter()

}

E("shortpatternWarning").hidden = !isSlow;

- E("matchWarning").hidden = compiledFilter instanceof RegExpFilter && compiledFilter.matches(item.location, item.typeDescr, item.docDomain, item.thirdParty);

+ E("matchWarning").hidden = compiledFilter instanceof RegExpFilter && compiledFilter.matches(item.location, RegExpFilter.toTypeMask(item.typeDescr), item.docDomain, item.thirdParty);

E("filter").value = filter;

}

@@ -318,7 +318,7 @@ function updatePatternSelection()

function testFilter(/**String*/ filter) /**Boolean*/

{

- return RegExpFilter.fromText(filter + "$" + item.typeDescr).matches(item.location, item.typeDescr, item.docDomain, item.thirdParty);

+ return RegExpFilter.fromText(filter + "$" + item.typeDescr).matches(item.location, RegExpFilter.toTypeMask(item.typeDescr), item.docDomain, item.thirdParty);

}

let anchorStartCheckbox = E("anchorStart");

« no previous file with comments | « no previous file | chrome/content/ui/sendReport.js » ('j') | lib/contentPolicy.js » ('J')