From: <ha...@us...> - 2011-07-04 20:26:04
|
Revision: 15721 http://jmol.svn.sourceforge.net/jmol/?rev=15721&view=rev Author: hansonr Date: 2011-07-04 20:25:58 +0000 (Mon, 04 Jul 2011) Log Message: ----------- version=12.1.51_dev # bug fix: Bad Jmol.js Modified Paths: -------------- trunk/Jmol/appletweb/Jmol.js Modified: trunk/Jmol/appletweb/Jmol.js =================================================================== --- trunk/Jmol/appletweb/Jmol.js 2011-07-04 20:25:31 UTC (rev 15720) +++ trunk/Jmol/appletweb/Jmol.js 2011-07-04 20:25:58 UTC (rev 15721) @@ -659,11 +659,11 @@ isBrowserCompliant = hasGetElementById; // known exceptions (old browsers): if (browser == "opera" && browserVersion <= 7.54 && os == "mac" -\xA0\xA0\xA0\xA0\xA0 || browser == "webkit" && browserVersion < 125.12 -\xA0\xA0\xA0\xA0\xA0 || browser == "msie" && os == "mac" + || browser == "webkit" && browserVersion < 125.12 + || browser == "msie" && os == "mac" || browser == "konqueror" && browserVersion <= 3.3 ) { -\xA0\xA0 \xA0isBrowserCompliant = false; + isBrowserCompliant = false; } // possibly more checks in the future for this This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ahe...@us...> - 2011-09-26 21:55:36
|
Revision: 16128 http://jmol.svn.sourceforge.net/jmol/?rev=16128&view=rev Author: aherraez Date: 2011-09-26 21:55:30 +0000 (Mon, 26 Sep 2011) Log Message: ----------- update of Jmol.js: # applet wrapped in <span>; # added new jmolSwitchToSignedApplet() Modified Paths: -------------- trunk/Jmol/appletweb/Jmol.js Modified: trunk/Jmol/appletweb/Jmol.js =================================================================== --- trunk/Jmol/appletweb/Jmol.js 2011-09-26 14:58:17 UTC (rev 16127) +++ trunk/Jmol/appletweb/Jmol.js 2011-09-26 21:55:30 UTC (rev 16128) @@ -82,6 +82,10 @@ // 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 3/2011 -- added jmolLoadAjax_STOLAF_NIH +// ah 9/2011 -- Applet is now wrapped in a <span> tag (might break existing user code). +// Added jmolSwitchToSignedApplet(); replaces an applet with the signed applet, +// preserving size, model and state; an additional script may be specified. +// Note: as a result, unsigned and signed applets may coexist in a page. var defaultdir = "." var defaultjar = "JmolApplet.jar" @@ -488,6 +492,26 @@ _jmolCheckBrowser(); } +var _jmolScriptForSwitching; +function jmolSwitchToSignedApplet(targetSuffix, additionalScript) { + if (!targetSuffix) { targetSuffix = "0"; } + if (!additionalScript) { additionalScript = ""; } + var s = jmolEvaluate("_signedApplet",targetSuffix); + var w = jmolEvaluate("_width",targetSuffix); + var h = jmolEvaluate("_height",targetSuffix); + if (s=="true") { + jmolScript(additionalScript,targetSuffix); + return; + } + var appletParent = document.getElementById("jmolApplet"+targetSuffix).parentNode; + _jmolScriptForSwitching = jmolGetPropertyAsString("stateInfo", "", targetSuffix) + additionalScript; + appletParent.innerHTML = ""; + _jmolGetJarFilename(true); + jmolSetDocument(false); + appletParent.innerHTML = jmolApplet([w,h], "javascript jmolScript(_jmolScriptForSwitching," + targetSuffix + ")", targetSuffix); + jmolSetDocument(document); +} + //////////////////////////////////////////////////////////////// // Cascading Style Sheet Class support //////////////////////////////////////////////////////////////// @@ -761,11 +785,11 @@ params.mayscript = 'true'; params.codebase = codebase; params.code = 'JmolApplet'; - tHeader = + tHeader = "<span>" + "<object name='jmolApplet" + nameSuffix + "' id='jmolApplet" + nameSuffix + "' " + appletCssText + "\n" + widthAndHeight + "\n"; - tFooter = "</object>"; + tFooter = "</object></span>"; } if (java_arguments) params.java_arguments = java_arguments; @@ -782,14 +806,14 @@ Removing the classid parameter seems to be well tolerated by all browsers (even IE!). */ } else { // use applet tag - tHeader = + tHeader = "<span>" + "<applet name='jmolApplet" + nameSuffix + "' id='jmolApplet" + nameSuffix + "' " + appletCssText + "\n" + widthAndHeight + "\n" + " code='JmolApplet'" + " archive='" + archivePath + "' codebase='" + codebase + "'\n" + " mayscript='true'>\n"; - tFooter = "</applet>"; + tFooter = "</applet></span>"; } var visitJava; if (useIEObject || useHtml4Object) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ahe...@us...> - 2011-09-30 19:31:34
|
Revision: 16188 http://jmol.svn.sourceforge.net/jmol/?rev=16188&view=rev Author: aherraez Date: 2011-09-30 19:31:27 +0000 (Fri, 30 Sep 2011) Log Message: ----------- easy change to the signed applet by using JMOLJAR=SIGNED on the URL Modified Paths: -------------- trunk/Jmol/appletweb/Jmol.js Modified: trunk/Jmol/appletweb/Jmol.js =================================================================== --- trunk/Jmol/appletweb/Jmol.js 2011-09-30 12:02:33 UTC (rev 16187) +++ trunk/Jmol/appletweb/Jmol.js 2011-09-30 19:31:27 UTC (rev 16188) @@ -105,6 +105,9 @@ // The default action, if the user just presses "OK" is to NOT allow the change. // The user must type the word "yes" in the prompt box for the change to be approved. +// For a simple change to the signed applet in the same original directory (if it's available), +// you can use JMOLJAR=SIGNED on the URL. + // If you don't want people to be able to switch in their own JAR file on your page, // simply set this next line to read "var allowJMOLJAR = false". @@ -132,6 +135,7 @@ alert("The web page URL was ignored. Continuing using " + _jmol.archivePath + ' in directory "' + codebaseDirectory + '"'); } } else { + if (f=="SIGNED") { f=true; } fileNameOrUseSignedApplet = f; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |