Merge branch 'master' of github.com:mishoo/UglifyJS2
This commit is contained in:
@@ -2067,7 +2067,8 @@ merge(Compressor.prototype, {
|
|||||||
&& self.left.right instanceof AST_Constant
|
&& self.left.right instanceof AST_Constant
|
||||||
&& self.right instanceof AST_Binary
|
&& self.right instanceof AST_Binary
|
||||||
&& self.right.operator == "+"
|
&& self.right.operator == "+"
|
||||||
&& self.right.left instanceof AST_Constant) {
|
&& self.right.left instanceof AST_Constant
|
||||||
|
&& self.right.is_string(compressor)) {
|
||||||
self = make_node(AST_Binary, self, {
|
self = make_node(AST_Binary, self, {
|
||||||
operator: "+",
|
operator: "+",
|
||||||
left: make_node(AST_Binary, self.left, {
|
left: make_node(AST_Binary, self.left, {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ concatenate_rhs_strings: {
|
|||||||
foo(bar() + 123 + "Hello" + "World" + ("Foo" + "Bar"));
|
foo(bar() + 123 + "Hello" + "World" + ("Foo" + "Bar"));
|
||||||
foo("Foo" + "Bar" + bar() + 123 + "Hello" + "World" + ("Foo" + "Bar"));
|
foo("Foo" + "Bar" + bar() + 123 + "Hello" + "World" + ("Foo" + "Bar"));
|
||||||
foo("Hello" + bar() + 123 + "World");
|
foo("Hello" + bar() + 123 + "World");
|
||||||
|
foo(bar() + 'Foo' + (10 + parseInt('10')));
|
||||||
}
|
}
|
||||||
expect: {
|
expect: {
|
||||||
foo(bar() + 123 + "HelloWorld");
|
foo(bar() + 123 + "HelloWorld");
|
||||||
@@ -18,5 +19,6 @@ concatenate_rhs_strings: {
|
|||||||
foo(bar() + 123 + "HelloWorldFooBar");
|
foo(bar() + 123 + "HelloWorldFooBar");
|
||||||
foo("FooBar" + bar() + "123HelloWorldFooBar");
|
foo("FooBar" + bar() + "123HelloWorldFooBar");
|
||||||
foo("Hello" + bar() + "123World");
|
foo("Hello" + bar() + "123World");
|
||||||
|
foo(bar() + 'Foo' + (10 + parseInt('10')));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user