X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=examples%2Fjavascript%2Fjalview.js;h=407e34a872c16ab67b8bd300e7a0fc31ad803e8b;hb=dc1ad37588e94cbc9ebbfaab2e9e49407f464310;hp=43d03bdc7a9da22f8136b7effbb12e0f669492d6;hpb=1d415c4766233d4710950f6b5384eab64bb629bb;p=jalview.git diff --git a/examples/javascript/jalview.js b/examples/javascript/jalview.js index 43d03bd..407e34a 100644 --- a/examples/javascript/jalview.js +++ b/examples/javascript/jalview.js @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -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; } } @@ -356,7 +353,7 @@ function _jmolMessagecallback(jmid, statmess) { var jvfollower = document.getElementById("jvfollower"); //console.log(">>>>>>>> lJvApp" + jvapp); linkJvJmol(jvapp); - }, 100); + }, 200); setConsole(document.getElementById("stdout")); }; @@ -367,7 +364,7 @@ function _jmolMessagecallback(jmid, statmess) { var jvfollower = document.getElementById("jvfollower"); console.log(">>>>>>> lJvFollow" + jvfollower); linkJvJmol(jvfollower); - }, 100); + }, 200); }; function lJvA() {