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
JAL-1859 embedded Jmol applet example updated for Jmol 14.2 javascript
[jalview.git]
/
examples
/
javascript
/
jalview.js
diff --git
a/examples/javascript/jalview.js
b/examples/javascript/jalview.js
index
7890854
..
c33be19
100644
(file)
--- a/
examples/javascript/jalview.js
+++ b/
examples/javascript/jalview.js
@@
-1,6
+1,6
@@
/**
/**
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-145,7
+145,9
@@
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=_jmolGetApplet(jmolView).id; // Jmol 12.4
+ jmolView=JmolFindTarget(jmolView).id; // Jmol 14.2.14
+ alert("FoundTarget " + jmolView.id);
var jmbinding=_jvjmols.get(jmolView);
if (!jmbinding)
{
var jmbinding=_jvjmols.get(jmolView);
if (!jmbinding)
{