JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make --comments keep @cc_on too

Browse Source
This commit is contained in:
Mihai Bazon
2012-10-09 18:25:00 +03:00
parent 1b0aab2ce9
commit 88beddfa91
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/uglifyjs2
View File

@@ -125,8 +125,7 @@ if (ARGS.comments) {
var type = comment.type; var type = comment.type;
if (type == "comment2") { if (type == "comment2") {
// multiline comment // multiline comment
return text.indexOf("@preserve") >= 0 return /@preserve|@license|@cc_on/i.test(test);
|| text.indexOf("@license") >= 0;
} }
} }
} }

10
lib/parse.js
View File

@@ -473,14 +473,6 @@ function tokenizer($TEXT, filename) {
S.pos = i + 2; S.pos = i + 2;
S.line += text.split("\n").length - 1; S.line += text.split("\n").length - 1;
S.newline_before = S.newline_before || text.indexOf("\n") >= 0; S.newline_before = S.newline_before || text.indexOf("\n") >= 0;
// https://github.com/mishoo/UglifyJS/issues/#issue/100
if (/^@cc_on/i.test(text)) {
warn("WARNING: at line " + S.line);
warn("*** Found \"conditional comment\": " + text);
warn("*** UglifyJS DISCARDS ALL COMMENTS. This means your code might no longer work properly in Internet Explorer.");
}
return token("comment2", text, true); return token("comment2", text, true);
}); });
}; };
@@ -1493,5 +1485,3 @@ function parse($TEXT, options) {
})(); })();
}; };
var warn = function() {};