X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=examples%2FembeddedWJmol.html;h=f629312d6b8a83874afa6a8c960ce8e42a06e596;hb=e8814cc25a95119c8201007f32035170db2ed299;hp=1c4c692f30d57b4ed66eda4e723bc9c131eb5671;hpb=472f47fc68c6f117334a76c0faffed5c86511fcd;p=jalview.git

diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html
index 1c4c692..f629312 100644
--- 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";}
@@ -218,19 +213,16 @@ function genHref()
  var jvstructassoc;
  var modeltofiles = new Array();
 
- //function lJvA() {
-  //jvfollower = document.getElementById("jvA");
-  //setConsole(document.getElementById("stdout"));
-  
-  //sep = jvfollower.getSeparator();
-  //jvapp.setSeparator(""+jvapp.getSeparator());
-//  linkJvJmol(jvfollower, "jmolView", modeltofiles);
-// };
+ function lJvA() {
+  jvfollower = document.getElementById("jvA");
+  setConsole(document.getElementById("stdout"));
+  linkJvJmol(jvfollower, "jmolView", modeltofiles);
+ };
 
  var _jvA=new Object();
  _jvA.attributes = {
   code : 'jalview.bin.JalviewLite',
-  archive : 'jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar',
+  archive : 'jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar,java-json.jar,json_simple-1.1.jar',
   width : '500',
   height : '350',
   mayscript : 'True',
@@ -282,12 +274,12 @@ function genHref()
 
 <div>
  <script>
-  jmolApplet("500x500","zap; load FILE '1gaq.txt'; frame 0; select all; wireframe off; spacefill off; cartoons; restrict; center *; set selectionhalos true;select 0","jmolView");
+  jmolApplet("500x500","zap; load FILE '1gaq.txt'; frame 0; background black; select all; wireframe off; spacefill off; cartoons; restrict; center *; set selectionhalos true;set hoverDelay 0.001; select 0","jmolView");
  </script>
 </div>
 <div>
 <applet
-   code="jalview.bin.JalviewLite" width="500" height="350" id="jvA" mayscript="True" scriptable="True" archive="jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar">
+   code="jalview.bin.JalviewLite" width="500" height="350" id="jvA" mayscript="mayscript" archive="jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar,java-json.jar,json_simple-1.1.jar">
 <param name="permissions" value="sandbox"/>
 <param name="java_arguments" value="-Xmx256m"/>
 <param name="externalstructureviewer" value="true"/>