Issue 30450043: Backport to es53 branch: r5620, r5622, r5629

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

Issue 30450043: Backport to es53 branch: r5620, r5622, r5629 (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
12 years, 3 months ago by kpreid2

Modified:
12 years, 3 months ago

Reviewers:
felix8a

CC:
google-caja-discuss_googlegroups.com

Base URL:
http://google-caja.googlecode.com/svn/branches/es53/

Visibility:
Public.

More Reviews

Description

These changes are security/correctness related or specific wanted features. r5620 Use distinct Confidences for tame node subtypes r5622 fix backslash-newline handling the JS parser r5629 Add some missing Picker methods to taming The merge command was svn merge -c 5620,5622,5629 https://google-caja.googlecode.com/svn/trunk and there were no conflicts. @r5631

Patch Set 1 #

Created: 12 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+365 lines, -281 lines)			Patch
M	.	View	0 chunks	+0 lines, -0 lines	0 comments	Download
M	src/com	View	0 chunks	+0 lines, -0 lines	0 comments	Download
M	src/com/google/caja/apitaming/google.picker.policyFactory.js	View	3 chunks	+4 lines, -0 lines	0 comments	Download
M	src/com/google/caja/lexer/InputElementSplitter.java	View	7 chunks	+6 lines, -66 lines	0 comments	Download
M	src/com/google/caja/parser/js/StringLiteral.java	View	2 chunks	+2 lines, -1 line	0 comments	Download
M	src/com/google/caja/plugin/domado.js	View	64 chunks	+181 lines, -99 lines	0 comments	Download
M	src/com/google/caja/render/TokenClassification.java	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	tests	View	0 chunks	+0 lines, -0 lines	0 comments	Download
M	tests/com/google/caja/apitaming/picker/allviews.html	View	1 chunk	+8 lines, -1 line	0 comments	Download
M	tests/com/google/caja/lexer/lexergolden1.txt	View	2 chunks	+92 lines, -92 lines	0 comments	Download
M	tests/com/google/caja/lexer/lexertest1.js	View	2 chunks	+6 lines, -9 lines	0 comments	Download
M	tests/com/google/caja/parser/js/ParserTest.java	View	2 chunks	+11 lines, -2 lines	0 comments	Download
M	tests/com/google/caja/parser/js/StringLiteralTest.java	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	tests/com/google/caja/parser/js/parsergolden10.txt	View	1 chunk	+15 lines, -0 lines	0 comments	Download
M	tests/com/google/caja/parser/js/parsertest10.js	View	1 chunk	+9 lines, -0 lines	0 comments	Download
M	tests/com/google/caja/plugin/test-domado-foreign-guest.html	View	2 chunks	+14 lines, -9 lines	0 comments	Download
M	tests/com/google/caja/render/JsMinimalPrinterTest.java	View	1 chunk	+16 lines, -0 lines	0 comments	Download

Messages

Total messages: 3

Expand All Messages | Collapse All Messages

kpreid2

To clarify, this is an automatic SVN merge with no conflicts, with the following command. ...

12 years, 3 months ago (2013-11-21 19:59:29 UTC) #2

lgtm

Expand All Messages | Collapse All Messages