git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug/JAL-2609attemptedmerge' into develop
[jalview.git]
/
examples
/
javascript
/
jalview.js
diff --git
a/examples/javascript/jalview.js
b/examples/javascript/jalview.js
index
fa38582
..
1c1f1c2
100644
(file)
--- a/
examples/javascript/jalview.js
+++ b/
examples/javascript/jalview.js
@@
-153,7
+153,7
@@
function linkJvJmol(applet, jmolView, modeltofiles) {
var sep = applet.getSeparator();
var oldjm=jmolView;
// recover full id of Jmol applet
var sep = applet.getSeparator();
var oldjm=jmolView;
// recover full id of Jmol applet
- jmolView=_jmolGetApplet(jmolView).id;
+ jmolView=jmolFindTarget(jmolView)._id; // Jmol 14.2.14
var jmbinding=_jvjmols.get(jmolView);
if (!jmbinding)
{
var jmbinding=_jvjmols.get(jmolView);
if (!jmbinding)
{
@@
-318,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) {
}
// 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;
}
}
msg = _jmolhovermsg;
}
}