Fix path-related bugs

mpds-io · Nov 24, 2024 · 8087b5f · 8087b5f
1 parent f8001da
commit 8087b5f
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/deploy-to-gh.yml b/.github/workflows/deploy-to-gh.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
           mkdir dist
           cp ermac.min.js src_js/third_party/jquery.min.js dist
-          cp -r webassets oauth crystvis dist
+          cp -r webassets oauth crystvis labs dist
           cp example_prod.html dist/index.html
 
       - name: Deploy

diff --git a/deploy/build_js.sh b/deploy/build_js.sh
@@ -4,7 +4,7 @@ ROOT=$(dirname $0)/../
 JSCOMP=$ROOT/third_party/jscomp/compiler.jar
 JSTARGET=$ROOT/ermac.min.js
 
-cat $ROOT/src_js/third_party/jquery.min.js >> $JSTARGET
+cat $ROOT/src_js/third_party/jquery.min.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

diff --git a/labs/view-phonons/index.html b/labs/view-phonons/index.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8" />
 <title>Phonon visualization</title>
 <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-<script type="text/javascript" src="/ermac/src_js/third_party/cifplayer.js"></script><!-- FIXME -->
+<script type="text/javascript" src="/webassets/cifplayer.js"></script>
 <style type="text/css">
 *{margin:0;padding:0;}
 

diff --git a/src_js/ptable.js b/src_js/ptable.js
@@ -130,11 +130,11 @@ function refresh_ptable_results(elA, elB, elC){
         if (els.length == 1){
 
             if (wmgui.ptable.dtypes == 2){
-                iframe_addr = wmgui.engines_addrs[wmgui.engines]['cifplayer'];
+                iframe_addr = wmgui.engines_addrs['cifplayer'];
                 wmgui.ptable.vis_fixed = true;
 
             } else if (wmgui.ptable.dtypes == 3){
-                iframe_addr = wmgui.engines_addrs[wmgui.engines]['visavis'];
+                iframe_addr = wmgui.engines_addrs['visavis'];
                 wmgui.ptable.vis_fixed = true;
 
             } else
@@ -148,11 +148,11 @@ function refresh_ptable_results(elA, elB, elC){
                 ajax_download(null, wmgui.search_endpoint + '?q=' + JSON.stringify(query_pds), render_right);
 
             } else if (wmgui.ptable.dtypes == 2){
-                iframe_addr = wmgui.engines_addrs[wmgui.engines]['cifplayer'];
+                iframe_addr = wmgui.engines_addrs['cifplayer'];
                 wmgui.ptable.vis_fixed = true;
 
             } else if (wmgui.ptable.dtypes == 3){
-                iframe_addr = wmgui.engines_addrs[wmgui.engines]['visavis'];
+                iframe_addr = wmgui.engines_addrs['visavis'];
                 wmgui.ptable.vis_fixed = true;
 
             } else
@@ -167,10 +167,10 @@ function refresh_ptable_results(elA, elB, elC){
                 iframe_addr = wmgui.v_pd_3d_addr + els.join('-');
 
             } else if (wmgui.ptable.dtypes == 2){
-                iframe_addr = wmgui.engines_addrs[wmgui.engines]['cifplayer'];
+                iframe_addr = wmgui.engines_addrs['cifplayer'];
 
             } else if (wmgui.ptable.dtypes == 3){
-                iframe_addr = wmgui.engines_addrs[wmgui.engines]['visavis'];
+                iframe_addr = wmgui.engines_addrs['visavis'];
 
             } else
                 document.getElementById('ptable_vis').innerHTML = '';
@@ -225,7 +225,7 @@ function render_left(data){
                 target_addr = '#' + wmgui.phase_endpoint + '?phid=' + phid + '&struct=1';
 
             if (target) target.contentWindow.location.hash = target_addr;
-            else document.getElementById('ptable_vis').innerHTML = '<iframe frameborder=0 scrolling="no" width="100%" height="850" src="' + wmgui.engines_addrs[wmgui.engines]['cifplayer'] + target_addr + '"></iframe>';
+            else document.getElementById('ptable_vis').innerHTML = '<iframe frameborder=0 scrolling="no" width="100%" height="850" src="' + wmgui.engines_addrs['cifplayer'] + target_addr + '"></iframe>';
 
         } else document.getElementById('ptable_vis').innerHTML = '';
 

diff --git a/src_js/third_party/cifplayer.js → webassets/cifplayer.js b/src_js/third_party/cifplayer.js → webassets/cifplayer.js
diff --git a/webassets/iframe_cifplayer.html b/webassets/iframe_cifplayer.html
@@ -6,7 +6,7 @@
 html, body{width:100%;height:100%;overflow:hidden;}
 optimade-cifplayer-player{width:100%;height:100%;}
 </style>
-<script type="text/javascript" src="../src_js/third_party/cifplayer.js"></script>
+<script type="text/javascript" src="/webassets/cifplayer.js"></script>
 <script type="text/javascript">
 "use strict";
 

diff --git a/webassets/iframe_visavis.html b/webassets/iframe_visavis.html
@@ -15,7 +15,7 @@
 <div id="main"></div>
 <div id="switcher" title="Show interactive plot (experimental feature)"></div>
 
-<script type="text/javascript" src="../src_js/third_party/visavis.js?090924"></script>
+<script type="text/javascript" src="/webassets/visavis.js"></script>
 <script type="text/javascript">
 "use strict";
 

diff --git a/webassets/pd_stub.html b/webassets/pd_stub.html
@@ -15,7 +15,7 @@
 <body>
 
 <div id="cross" title="Close"></div>
-<div id="switcher" title="Show interactive plot (experimental feature)"></div>
+<div id="switcher" title="Switch between static and dynamic"></div>
 
 <script type="text/javascript">
 if (document.location.hash.length){

diff --git a/src_js/third_party/visavis.js → webassets/visavis.js b/src_js/third_party/visavis.js → webassets/visavis.js