aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMihai Bazon <mihai@bazon.net>2013-10-27 10:03:01 +0200
committerMihai Bazon <mihai@bazon.net>2013-10-27 10:03:01 +0200
commitb47f7b76b9f0ff5e34d744439f327897a592f675 (patch)
tree4c416fa98867b10f2f06442134c16537ee60a10f /lib
parent582cc55cffc198f3401f90a0b32e2fcbe89afee1 (diff)
parent8979579e55025a72caf580788b48831cd7d623de (diff)
downloadtracifyjs-b47f7b76b9f0ff5e34d744439f327897a592f675.tar.gz
tracifyjs-b47f7b76b9f0ff5e34d744439f327897a592f675.zip
Merge branch 'master' of github.com:mishoo/UglifyJS2
Diffstat (limited to 'lib')
-rw-r--r--lib/compress.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/compress.js b/lib/compress.js
index 121e312a..13ae7c70 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -2067,7 +2067,8 @@ merge(Compressor.prototype, {
&& self.left.right instanceof AST_Constant
&& self.right instanceof AST_Binary
&& 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, {
operator: "+",
left: make_node(AST_Binary, self.left, {