From: <ha...@us...> - 2013-10-31 22:15:06
|
Revision: 18887 http://sourceforge.net/p/jmol/code/18887 Author: hansonr Date: 2013-10-31 22:15:00 +0000 (Thu, 31 Oct 2013) Log Message: ----------- ___JmolVersion="13.3.8_dev_2013.10.31" bug fix: following Java update, adding proper path check for local signed applet Modified Paths: -------------- trunk/Jmol/appletweb/old/Jmol.js Modified: trunk/Jmol/appletweb/old/Jmol.js =================================================================== --- trunk/Jmol/appletweb/old/Jmol.js 2013-10-31 21:49:40 UTC (rev 18886) +++ trunk/Jmol/appletweb/old/Jmol.js 2013-10-31 22:15:00 UTC (rev 18887) @@ -1,4 +1,4 @@ -/* Jmol 12.0 script library Jmol.js 9:48 PM 1/31/2011 Bob Hanson +/* Jmol 12.0 script library Jmol.js 10/31/2013 5:12:44 PM Bob Hanson NOTE: THIS LIBRARY IS DEPRECATED STARTING WITH Jmol 13.0. @@ -90,6 +90,8 @@ // bh 4/2010 -- added jmolSetMemoryMb(nMb) // ah 1/2011 -- wider detection of browsers; more browsers now use the object tag instead of the applet tag; // fix of object tag (removed classid) accounts for change of behavior in Chrome +// bh 5/2013 -- fix for master checkbox click not actuating checkboxes +// bh 10/2013 -- fix for local signed applet having wrong default directory in Java v45 var defaultdir = "." var defaultjar = "JmolApplet.jar" @@ -590,6 +592,7 @@ targetText: ",0", scripts: [""], params: { + documentLocation: document.location.href, syncId: ("" + Math.random()).substring(3), progressbar: "true", progresscolor: "blue", @@ -767,6 +770,8 @@ var tHeader, tFooter; codebase || jmolInitialize("."); params.name = "jmolApplet" + nameSuffix + params.permissions = (archivePath.indexOf("Signed") >= 0 ? "all-permissions" : "sandbox"); + if (useIEObject || useHtml4Object) { params.archive = archivePath; params.mayscript = 'true'; @@ -1070,10 +1075,9 @@ var doc = win.document; if (doc.getElementById(target)) return doc.getElementById(target); - else if (doc.applets) + if (doc.applets) return doc.applets[target]; - else - return doc[target]; + return doc[target]; } function _jmolAddScript(script) { @@ -1148,8 +1152,9 @@ function _jmolNotifyGroup(m, isOn){ //called when a master item is checked for (var chkBox in m.chkGroup){ - var item = m.chkGroup[chkBox] - item.checked = isOn; + var item = m.chkGroup[chkBox] + if (item.checked != isOn) + item.click(); if (_jmol.checkboxMasters[item.id]) _jmolNotifyGroup(_jmol.checkboxMasters[item.id], isOn) } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |