Skip to content

Commit

Permalink
skip ckeditor.js compression for B-ZKCK-11
Browse files Browse the repository at this point in the history
  • Loading branch information
hanhsu committed Jan 14, 2015
1 parent 99cbb22 commit 079efcd
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
17 changes: 14 additions & 3 deletions bin/zipjs
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,26 @@ function zips
if [ "$TERM" = "cygwin" ] ; then
dstfl=$(cygpath -wa $dstfl)
fi
java -jar $jarfl --charset UTF-8 $type "$f" -o "$dstfl" 2>&1
# B-ZKCK-11: skip ckeditor.js since it's already minified
if [ "$f" != "ckeditor.js" ] ; then
java -jar $jarfl --charset UTF-8 $type "$f" -o "$dstfl" 2>&1
fi
if [ $? != 0 ] ; then
echo "Warning failed to compress, use copy instead: $f"
cvt=false
elif [ "$type" = "" ] ; then #JS
if [ "$TERM" = "cygwin" ] ; then
srcfile=$(cygpath -wa $dst/${f%.js}.src.js)
if [ "$f" = "ckeditor.js" ] ; then # B-ZKCK-11
srcfile=$(cygpath -wa $dst/${f%.js}.js)
else
srcfile=$(cygpath -wa $dst/${f%.js}.src.js)
fi
else
srcfile=$dst/${f%.js}.src.js
if [ "$f" = "ckeditor.js" ] ; then # B-ZKCK-11
srcfile=$dst/${f%.js}.js
else
srcfile=$dst/${f%.js}.src.js
fi
fi
java -classpath $bshjar bsh.Interpreter $bshcmd "./$f" "$srcfile"
#always make a copy so we can use them if we want to debug them
Expand Down
5 changes: 5 additions & 0 deletions ckez/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>**/ckeditor.js</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Binary file modified dist/lib/ckez.jar
Binary file not shown.

0 comments on commit 079efcd

Please sign in to comment.