JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / examples / javascript / jalview.js

diff --git a/examples/javascript/jalview.js b/examples/javascript/jalview.js
index fa08a4d..1c1f1c2 100644 (file)
--- a/examples/javascript/jalview.js
+++ b/examples/javascript/jalview.js
@@ -153,8 +153,7 @@ function linkJvJmol(applet, jmolView, modeltofiles) {
                var sep = applet.getSeparator();
                var oldjm=jmolView;
                // recover full id of Jmol applet
-//             jmolView=_jmolGetApplet(jmolView).id; // Jmol 12.4
-               jmolView=jmolFindTarget(jmolView).id; // Jmol 14.2.14
+               jmolView=jmolFindTarget(jmolView)._id; // Jmol 14.2.14
                var jmbinding=_jvjmols.get(jmolView);
                if (!jmbinding)
                {       
@@ -319,10 +318,8 @@ function _jmolhover(jmid, atomlabel, atomidx) {
        }
        // use atomlabel[5] to look up model filename so we can highlight associated positions in any jalviews
        for (ap in _jvapps) {
-               _jvapps[ap].mouseOverStructure(atomlabel[2], atomlabel[3],
-                               getDocumentBase()
-                                               + "/" + 
-                                               modeltofiles[atomlabel[5]]);
+               pdb = getDocumentBase() + modeltofiles[atomlabel[5]];
+               _jvapps[ap].mouseOverStructure(atomlabel[2], atomlabel[3], pdb);
                msg = _jmolhovermsg;
        }
 }