http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84628
Revision: 84628
Author: catrope
Date: 2011-03-23 19:37:39 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
1.17wmf1: MFT r83934 to unbreak the minifier
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php
Modified: branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php
===================================================================
--- branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php 2011-03-23
19:28:22 UTC (rev 84627)
+++ branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php 2011-03-23
19:37:39 UTC (rev 84628)
@@ -526,10 +526,11 @@
$state = self::STATEMENT;
$lineLength = 0;
} elseif( $maxLineLength > 0 && $lineLength + $end -
$pos > $maxLineLength &&
- !isset( $semicolon[$state][$type] ) )
+ !isset( $semicolon[$state][$type] ) &&
$type !== self::TYPE_INCR_OP )
{
// This line would get too long if we added
$token, so add a newline first.
- // Only do this if it won't trigger semicolon
insertion though.
+ // Only do this if it won't trigger semicolon
insertion and if it won't
+ // put a postfix increment operator on its own
line, which is illegal in js.
$out .= "\n";
$lineLength = 0;
// Check, whether we have to separate the token from
the last one with whitespace
Property changes on: branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/libs/JavaScriptMinifier.php:51646
/branches/new-installer/phase3/includes/libs/JavaScriptMinifier.php:43664-66004
/branches/sqlite/includes/libs/JavaScriptMinifier.php:58211-58321
/branches/wmf/1.16wmf4/includes/libs/JavaScriptMinifier.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/libs/JavaScriptMinifier.php:53381,60970
/trunk/phase3/includes/libs/JavaScriptMinifier.php:83590,83934
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
