JAL-1859 embedded Jmol applet example updated for Jmol 14.2 javascript

[jalview.git] / examples / embeddedWJmol.html

diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html
index e8c9df3..bf050c0 100644 (file)
--- a/examples/embeddedWJmol.html
+++ b/examples/embeddedWJmol.html
@@ -85,7 +85,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
 //--><!]]>
   </script>
 <script src="javascript/deployJava.js"></script>
-<script src="jmol/Jmol.js"></script>
+<script src="jmol/Jmol2.js"></script>
 <script src="javascript/jquery-1.4.4.min.js"></script>
 <script src="javascript/jquery.timer.js"></script>
 <script src="javascript/jquery.blockUI.js"></script>
@@ -96,15 +96,7 @@ var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_tr
 <script language="JavaScript">
 // instead of this, we use a custom JmolApplet spec
 // jmolInitialize('jmol');
-jmolInitialize("","JmolApplet-12.2.4.jar");
-function genHref()
-{
- var s1 = "ml:i@midd..", s2 = "atelcpoueau", s3 = "iomyob.neck", href="";
- for(i=0; i<11; i++)
- { href = href + s1.charAt(i) + s2.charAt(i) + s3.charAt(i); 
- }
- window.location=href;
-}
+jmolInitialize("","JmolApplet-14.2.14_2015.06.11.jar");
 </script>
 <script>
  var loglevel=1;
@@ -130,7 +122,7 @@ function genHref()
   jvfollower = document.getElementById("jvA");
   setConsole(document.getElementById("stdout"));
   
-  sep = jvfollower.getSeparator();
+ // sep = jvfollower.getSeparator();
   //jvapp.setSeparator(""+jvapp.getSeparator());
   linkJvJmol(jvfollower, "jmolView", modeltofiles);
  };
@@ -138,7 +130,7 @@ function genHref()
  var _jvA=new Object();
  _jvA.attributes = {
   code : 'jalview.bin.JalviewLite',
-  archive : 'jalviewApplet.jar,JmolApplet-12.2.4.jar',
+  archive : 'jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar',
   width : '500',
   height : '350',
   mayscript : 'True',