| Index: branches/wmf/1.17wmf1/includes/libs/JavaScriptMinifier.php |
| — | — | @@ -526,10 +526,11 @@ |
| 527 | 527 | $state = self::STATEMENT; |
| 528 | 528 | $lineLength = 0; |
| 529 | 529 | } elseif( $maxLineLength > 0 && $lineLength + $end - $pos > $maxLineLength && |
| 530 | | - !isset( $semicolon[$state][$type] ) ) |
| | 530 | + !isset( $semicolon[$state][$type] ) && $type !== self::TYPE_INCR_OP ) |
| 531 | 531 | { |
| 532 | 532 | // This line would get too long if we added $token, so add a newline first. |
| 533 | | - // Only do this if it won't trigger semicolon insertion though. |
| | 533 | + // Only do this if it won't trigger semicolon insertion and if it won't |
| | 534 | + // put a postfix increment operator on its own line, which is illegal in js. |
| 534 | 535 | $out .= "\n"; |
| 535 | 536 | $lineLength = 0; |
| 536 | 537 | // 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 |
| 537 | 538 | Merged /branches/sqlite/includes/libs/JavaScriptMinifier.php:r58211-58321 |
| 538 | 539 | Merged /trunk/phase3/includes/libs/JavaScriptMinifier.php:r83590,83934 |
| 539 | 540 | Merged /branches/new-installer/phase3/includes/libs/JavaScriptMinifier.php:r43664-66004 |
| 540 | 541 | Merged /branches/wmf-deployment/includes/libs/JavaScriptMinifier.php:r53381,60970 |
| 541 | 542 | Merged /branches/REL1_15/phase3/includes/libs/JavaScriptMinifier.php:r51646 |
| 542 | 543 | Merged /branches/wmf/1.16wmf4/includes/libs/JavaScriptMinifier.php:r67177,69199,76243,77266 |