From: gmungoc Date: Tue, 8 Sep 2015 09:08:57 +0000 (+0100) Subject: JAL-1859 Jmol applet black background; fix _jvmols table key X-Git-Tag: Release_2_10_0~465^2~4 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7d5a6f34b7dc941231fc1aecbed041c9e5afc98d;p=jalview.git JAL-1859 Jmol applet black background; fix _jvmols table key --- diff --git a/examples/embeddedWJmol.html b/examples/embeddedWJmol.html index eef45b4..8ef18d9 100644 --- a/examples/embeddedWJmol.html +++ b/examples/embeddedWJmol.html @@ -222,7 +222,7 @@ jmolInitialize("","JmolApplet-14.2.14_2015.06.11.jar"); var _jvA=new Object(); _jvA.attributes = { code : 'jalview.bin.JalviewLite', - archive : 'jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar', + archive : 'u_jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar', width : '500', height : '350', mayscript : 'True', @@ -274,12 +274,12 @@ jmolInitialize("","JmolApplet-14.2.14_2015.06.11.jar");
+ code="jalview.bin.JalviewLite" width="500" height="350" id="jvA" mayscript="mayscript" archive="u_jalviewApplet.jar,JmolApplet-14.2.14_2015.06.11.jar"> diff --git a/examples/javascript/jalview.js b/examples/javascript/jalview.js index 26d87dc..7172948 100644 --- a/examples/javascript/jalview.js +++ b/examples/javascript/jalview.js @@ -153,7 +153,7 @@ function linkJvJmol(applet, jmolView, modeltofiles) { var sep = applet.getSeparator(); var oldjm=jmolView; // recover full id of Jmol applet - jmolView=jmolFindTarget(jmolView); // Jmol 14.2.14 + jmolView=jmolFindTarget(jmolView)._id; // Jmol 14.2.14 var jmbinding=_jvjmols.get(jmolView); if (!jmbinding) {