r81246 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r81245‎ \| r81246 \| r81247 >
Date:	12:48, 31 January 2011
Author:	catrope
Status:	ok
Tags:
Comment:	(bug 27046) Do not strip newlines following C++-style // comments. Prior to this commit, such newlines were always stripped, causing invalid JS output in certain cases. They are now always preserved, even if they would normally qualifiy for vertical whitespace stripping/collapsing when wgResourceLoaderMinifyJSVerticalSpace is enabled.
Modified paths:	/trunk/phase3/includes/libs/JavaScriptDistiller.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/libs/JavaScriptDistiller.php
—	—	@@ -84,7 +84,8 @@
85	85	$parser->add( '/[^\\w\\$\\/\'")\\?:]\\/[^\\/\\r\\n\\][^\\/\\r\\n]*\\/g?i?/', '$1' );
86	86	// Remove comments
87	87	$parser->add( '/\\/\\(.\|[\\r\\n])?\\*\\//' );
88		~~- $parser->add( '/\\/\\/[^\\r\\n]*[\\r\\n]/' );~~
	88	+ // Preserve the newline after a C++-style comment -- bug 27046
	89	+ $parser->add( '/\\/\\/[^\\r\\n]*([\\r\\n])/', '$2' );
89	90	return $parser;
90	91	}
91	92	}

Revision	Commit summary	Author	Date
r81411	1.17: MFT r81186, r81187, r81197, r81209, r81210, r81211, r81215, r81238, r81...	catrope	20:23, 2 February 2011

Revision	Commit summary	Author	Date
r81212	Workaround for bug 27046: add semicolon where implied statement terminator wa...	brion	20:23, 30 January 2011

20:24, 2 February 2011 Catrope (talk | contribs) changed the tags for r81246 [removed: 1.17]
19:14, 2 February 2011 Trevor Parscal (WMF) (talk | contribs) changed the tags for r81246 [removed: trevor]
16:15, 1 February 2011 MarkAHershberger (talk | contribs) changed the status of r81246 [removed: new added: ok]
12:49, 31 January 2011 Catrope (talk | contribs) changed the tags for r81246 [added: trevor]
12:49, 31 January 2011 Catrope (talk | contribs) changed the tags for r81246 [added: 1.17]