From d684b7960de7297d275afccb2f6aadc90c79ab18 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 28 Jul 2017 22:50:30 +0200
Subject: [PATCH] Fix minimizing

---
 Tools/jsBuilder.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/Tools/jsBuilder.sh b/Tools/jsBuilder.sh
index 711af6f..e55aa73 100644
--- a/Tools/jsBuilder.sh
+++ b/Tools/jsBuilder.sh
@@ -7,24 +7,18 @@ do
     echo "" >> ${OUT}
 done
 
-# Remove single line comments
-sed -i -e '/\/\/.*//g' ${OUT}
 # Remove spaces at end of line
 sed -i -e 's/[[:blank:]]*$//g' ${OUT}
-
-# Minimize
-#java -jar ${TOOLS_PATH}/closure-compiler* --compilation_level SIMPLE_OPTIMIZATIONS --js ${OUT} --js_output_file ${OUT}.min
-#rm ${OUT}
-#mv ${OUT}.min ${OUT}
-
 # Make single line
 sed -i -e ':a;N;$!ba;s/\n/ /g' ${OUT}
-# Remove multiline comments
-sed -i -e '/\/\*/,/*\//g' ${OUT}
 # Remove multiple spaces
 sed -i -e 's/  */ /g' ${OUT}
 # Remove double js initialization
 sed -i -e 's/(function *(jsOMS) *{ *"use strict";//g' ${OUT}
-sed -i -e 's/} *(window.jsOMS = window.jsOMS || {}));//g' ${OUT}
+sed -i -e 's/} *(window.jsOMS *= *window.jsOMS *|| *{}));//g' ${OUT}
 
 echo "(function(jsOMS){\"use strict\";$(cat ${OUT})}(window.jsOMS = window.jsOMS || {}));" > ${OUT}
+
+java -jar ${TOOLS_PATH}/closure-compiler* --compilation_level WHITESPACE_ONLY --js ${OUT} --js_output_file ${OUT}.min
+rm ${OUT}
+mv ${OUT}.min ${OUT}
\ No newline at end of file