diff --git a/.github/workflows/deploy-to-gh.yml b/.github/workflows/deploy-to-gh.yml
index 3d7a35e..d688f33 100644
--- a/.github/workflows/deploy-to-gh.yml
+++ b/.github/workflows/deploy-to-gh.yml
@@ -1,7 +1,9 @@
name: Build on GitHub
on:
- workflow_dispatch:
+ push:
+ branches:
+ - master
jobs:
build-then-deploy:
@@ -23,14 +25,13 @@ jobs:
- name: Save files
run: |
- mkdir build
- cp ermac.min.js jquery.min.js build
- cp -r webassets build
- cp example_prod.html build/index.html
- ls -al build
+ mkdir dist
+ cp ermac.min.js jquery.min.js dist
+ cp -r webassets oauth crystvis dist
+ cp example_prod.html dist/index.html
- name: Deploy
uses: JamesIves/github-pages-deploy-action@4.1.7
with:
branch: gh-pages
- folder: build
+ folder: dist
diff --git a/deploy/build_js.sh b/deploy/build_js.sh
index 0f96937..81cdf1a 100755
--- a/deploy/build_js.sh
+++ b/deploy/build_js.sh
@@ -4,16 +4,16 @@ ROOT=$(dirname $0)/../
JSCOMP=$ROOT/third_party/jscomp/compiler.jar
JSTARGET=$ROOT/ermac.min.js
-echo '/* Author: Evgeny Blokhin, Tilde Materials Informatics */' > $JSTARGET
-
# Desktop (not mobile) GUI
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/browser_chk.js >> $JSTARGET
+
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/jquery.tablesorter.js --compilation_level WHITESPACE_ONLY >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/wNumb.js >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/nouislider.js >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/selectize.js >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/selectize_preserve_on_blur.js >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT_NEXT --js $ROOT/src_js/third_party/optimade_mpds_nlp.js >> $JSTARGET
+
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/wmsettings.js >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT_NEXT --js $ROOT/src_js/wmcore.js >> $JSTARGET
java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/sliders.js >> $JSTARGET
diff --git a/example_prod.html b/example_prod.html
index 6278d9e..2b7c3f0 100755
--- a/example_prod.html
+++ b/example_prod.html
@@ -2,7 +2,7 @@
-
+
diff --git a/webassets/ermac.css b/webassets/ermac.css
index d7d6ea9..84a798d 100755
--- a/webassets/ermac.css
+++ b/webassets/ermac.css
@@ -195,7 +195,7 @@ div.context_msg{display:none;width:70%;margin:0 auto;padding-top:10px;color:#555
#plt_cube > a{width:70px !important;background:url(plots.gif) -265px 0 no-repeat;}
#apihint{font-weight:normal;color:#000;font-size:1.15em;line-height:1.5em;margin-bottom:50px;padding:20px 5px 45px;background:#f6f6f6;overflow-wrap:break-word;}
-#apihint span{color:#c00;font-weight:bold;}
+#apihint span{color:#c00;}
#apihint a{text-decoration:none;color:#000;border-bottom:1px solid #000;}
/*
#fdwidget{height:175px;text-align:center;letter-spacing:1px;font-size:1em;font-weight:normal;line-height:1.8em;}