Ticket #3778: 3778.patch

_source/includes/scriptcompressor.js

@@ -56 +56 @@
         lang[ Token.COMMA ] = ',';
         lang[ Token.IN ] = ' in ';
 
-        // From http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Operators:Operator_Precedence
+        // From https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference/Operators/Operator_Precedence
         var precedence = {};
         precedence[ Token.DOT ] = 1;
         precedence[ Token.INC ] = precedence[ Token.DEC ] = 3;
@@ -930 +930 @@
                                 break;
 
                         case Token.HOOK :
-                                writeNode( node = node.getFirstChild() );
+                                node = node.getFirstChild();
+
+                                var hasPrecedence = 
+                                                associativityRTL[ node.getType() ] 
+                                                && precedence[ node.getType() ]
+                                                && ( precedence[ Token.HOOK ] <= precedence[ node.getType() ] );
+
+                                if ( hasPrecedence )
+                                        out( '(' );                                             
+
+                                writeNode( node );
+
+                                if ( hasPrecedence )
+                                        out( ')' );                             
+
                                 out( '?' );
                                 writeNode( node = node.getNext() );
                                 out( ':' );

test/test.js

@@ -280 +280 @@
                         "var a={'0123':'0123'};" ],
 
                 [       "var a={'123':'123'};",
-                        "var a={123:'123'};" ]
+                        "var a={123:'123'};" ],
+
+                [       "var a=(b)?c:d;",
+                        "var a=b?c:d;" ],
+
+                [       "var a=(b=c)?d:e;" ]
         ];
 
         var tests =