X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=includes%2Flibs%2FJavaScriptMinifier.php;h=f67387b323c7db163d527b5632bd0fec5779d561;hb=102bfd66c84dbb9b690c78ad0c3975b7dc8f1a0a;hp=301582524994aaa13522725fc5035702da1007c5;hpb=f93b2987aad8f3dbcbe406a82d32c494514ea2d1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/JavaScriptMinifier.php b/includes/libs/JavaScriptMinifier.php
index 3015825249..f67387b323 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -92,7 +92,7 @@ class JavaScriptMinifier {
 	 * Returns minified JavaScript code.
 	 *
 	 * @param string $s JavaScript code to minify
-	 * @return String Minified code
+	 * @return string Minified code
 	 */
 	public static function minify( $s ) {
 		// First we declare a few tables that contain our parsing rules
@@ -334,6 +334,8 @@ class JavaScriptMinifier {
 					self::ACTION_GOTO => self::PAREN_EXPRESSION,
 				],
 			],
+			// Property assignment - This is an object literal declaration.
+			// For example: `{ key: value }`
 			self::PROPERTY_ASSIGNMENT => [
 				self::TYPE_COLON => [
 					self::ACTION_GOTO => self::PROPERTY_EXPRESSION,
@@ -520,6 +522,7 @@ class JavaScriptMinifier {
 					self::ACTION_GOTO => self::STATEMENT,
 				],
 			],
+			// Property expression - The value of a key in an object literal.
 			self::PROPERTY_EXPRESSION => [
 				self::TYPE_BRACE_OPEN => [
 					self::ACTION_PUSH => self::PROPERTY_EXPRESSION_OP,
@@ -547,7 +550,8 @@ class JavaScriptMinifier {
 					self::ACTION_GOTO => self::PROPERTY_EXPRESSION,
 				],
 				self::TYPE_HOOK => [
-					self::ACTION_GOTO => self::PROPERTY_EXPRESSION,
+					self::ACTION_PUSH => self::PROPERTY_EXPRESSION,
+					self::ACTION_GOTO => self::EXPRESSION_TERNARY,
 				],
 				self::TYPE_COMMA => [
 					self::ACTION_GOTO => self::PROPERTY_ASSIGNMENT,