Browse files

Merge branch 'master' of git@yuisource.corp.yahoo.com:yuicompressor

  • Loading branch information...
2 parents e7ea458 + d0464c4 commit 281808bfc2843358f9b340c664e8c23d0fa9dbc6 @stoyan stoyan committed May 19, 2010
Showing with 6 additions and 3 deletions.
  1. +4 −2 src/org/mozilla/javascript/TokenStream.java
  2. +2 −1 tests/suite.sh
View
6 src/org/mozilla/javascript/TokenStream.java
@@ -703,8 +703,10 @@ final int getToken() throws IOException
String s1 = sb.toString();
String s2 = s1.trim();
if (s1.startsWith("!")) {
- // Remove the leading '!'
- this.string = s1.substring(1);
+ // Remove the leading '!' ** EDIT actually don't remove it:
+ // http://yuilibrary.com/projects/yuicompressor/ticket/2528008
+ // this.string = s1.substring(1);
+ this.string = s1;
return Token.KEEPCOMMENT;
} else if (s2.startsWith("@cc_on") ||
s2.startsWith("@if") ||
View
3 tests/suite.sh
@@ -4,6 +4,7 @@ cd $(dirname $0)
# Get the jar to use.
jar="$(ls ../build/*.jar | sort | tail -n1)"
+echo "jar: $jar"
runtest () {
testfile="$1"
@@ -58,4 +59,4 @@ ls *.css | while read testfile; do
runtest $testfile "cssminjs" || exit 1
done
-exit 0
+exit 0

0 comments on commit 281808b

Please sign in to comment.