JS: Minify our main JS file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 18685db33dc0c93b582dd13a210d00020ab2a09d..2a988bb5b16a054b14c2c007a0995d7be9d60ce9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -325,16 +325,16 @@ CLEANFILES += \
 static_js_DATA = \
        src/static/js/jquery.min.js \
        src/static/js/job-log-stream.min.js \
-       src/static/js/pbs.js
+       src/static/js/pbs.min.js
 
 static_jsdir = $(staticdir)/js
 
 EXTRA_DIST += \
-       src/static/js/job-log-stream.js
+       src/static/js/job-log-stream.js \
+       src/static/js/pbs.js
 
 CLEANFILES += \
-       src/static/js/job-log-stream.min.js \
-       src/static/js/jquery.min.js
+       $(static_js_DATA)
 
 dist_static_fonts_DATA = \
        src/third-party/fonts/prompt/OFL.txt \

diff --git a/src/templates/base.html b/src/templates/base.html
index 893e5f62a6ec1a75435542c4a05c1236cdc89044..15a9e67b808ef9811c37f1e258578cbbb8c53d76 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -136,6 +136,6 @@
 
                <!-- include javascript files -->
                <script src="{{ static_url("js/jquery.min.js") }}"></script>
-               <script src="{{ static_url("js/pbs.js") }}"></script>
+               <script src="{{ static_url("js/pbs.min.js") }}"></script>
        </body>
 </html>