X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=examples%2Fjavascript%2Fjalview.js;h=1c1f1c2cc49107d372441c859122bf24a9e3a83c;hb=92a19874dd2397604d4c7284a15eb54f8a3cba58;hp=c33be1990e57a419b8ff214539f5614bfec925dd;hpb=0b29b2f4d9bfb2c9dd551637cf6fd7b6dd59715e;p=jalview.git

diff --git a/examples/javascript/jalview.js b/examples/javascript/jalview.js
index c33be19..1c1f1c2 100644
--- a/examples/javascript/jalview.js
+++ b/examples/javascript/jalview.js
@@ -17,6 +17,14 @@
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 
+
+
+
+
+
+
+
+
 // default console to report messages
 var _console = document.getElementById("stdout");
 var _jvapps = new Array();
@@ -145,9 +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
-		alert("FoundTarget " + jmolView.id);
+		jmolView=jmolFindTarget(jmolView)._id; // Jmol 14.2.14
 		var jmbinding=_jvjmols.get(jmolView);
 		if (!jmbinding)
 		{	
@@ -312,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;
 	}
 }
@@ -340,3 +344,37 @@ function _jmolMessagecallback(jmid, statmess) {
 
 	}
 }
+
+
+  function lJvApp() {
+    setTimeout(function() {
+       //alert("in lJvApp");
+       var jvapp = document.getElementById("jvapp");
+       var jvfollower = document.getElementById("jvfollower");
+       //console.log(">>>>>>>> lJvApp" + jvapp);
+       linkJvJmol(jvapp);
+    }, 200);
+    setConsole(document.getElementById("stdout"));
+  };
+
+  function lJvFollow() {
+    setTimeout(function() {
+       //alert("in lJvFollow");
+       var jvapp = document.getElementById("jvapp");
+       var jvfollower = document.getElementById("jvfollower");
+       console.log(">>>>>>> lJvFollow" + jvfollower);
+       linkJvJmol(jvfollower);
+    }, 200);
+  };
+
+  function lJvA() {
+    setTimeout(function() {
+      //alert("lJvA");
+      jvfollower = document.getElementById("jvA");
+      setConsole(document.getElementById("stdout"));  
+      //sep = jvfollower.getSeparator();
+      //jvapp.setSeparator(""+jvapp.getSeparator());
+      linkJvJmol(jvfollower, "jmolView", modeltofiles);
+    }, 100);
+  };
+