Merge branch 'features/JAL-857_dynamic-example-files' into develop

[jalview.git] / examples / embeddedWJmol.html

diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html
index 1c4c692..31a627d 100644 (file)
--- a/examples/embeddedWJmol.html
+++ b/examples/embeddedWJmol.html
@@ -103,7 +103,7 @@ jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":
 
 
 <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>
@@ -189,16 +189,11 @@ jQuery.extend(Drupal.settings, {"basePath":"\/","pathPrefix":"","ajaxPageState":
   
 
 <script language="JavaScript">
+// instead of this, we use a custom JmolApplet spec
+// jmolInitialize('jmol');
 jmolInitialize("","JmolApplet-14.2.14_2015.06.11.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;
-}
-
+</script>
+<script>
  var loglevel=1;
  function dbg(lvl,string) {
   if (_console && lvl<=loglevel) {_console.value += string + "\n";}
@@ -222,7 +217,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);
 // };