From: <ha...@us...> - 2012-04-23 03:23:06
|
Revision: 17036 http://jmol.svn.sourceforge.net/jmol/?rev=17036&view=rev Author: hansonr Date: 2012-04-23 03:22:59 +0000 (Mon, 23 Apr 2012) Log Message: ----------- version=12.2.23_dev # bug fix: callback functions for modular calls: applet0.readCallback(....) Modified Paths: -------------- branches/v12_2/Jmol/src/org/jmol/applet/Jmol.java branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_2/Jmol/src/org/jmol/applet/Jmol.java =================================================================== --- branches/v12_2/Jmol/src/org/jmol/applet/Jmol.java 2012-04-23 03:21:04 UTC (rev 17035) +++ branches/v12_2/Jmol/src/org/jmol/applet/Jmol.java 2012-04-23 03:22:59 UTC (rev 17036) @@ -35,6 +35,7 @@ import org.jmol.util.Escape; import org.jmol.util.Logger; import org.jmol.util.Parser; +import org.jmol.util.TextFormat; import java.awt.Color; import java.awt.Dimension; @@ -1025,11 +1026,18 @@ if (!doCallback || !mayScript) return; try { - JSObject jsoWindow = JSObject.getWindow(appletWrapper); - if (callback.equals("alert")) - jsoWindow.call(callback, new Object[] { strInfo }); - else if (callback.length() > 0) - jsoWindow.call(callback, data); + JSObject jso = JSObject.getWindow(appletWrapper); + if (callback.equals("alert")) { + jso.call(callback, new Object[] { strInfo }); + } else if (callback.length() > 0) { + if (callback.indexOf(".") > 0) { + String[] mods = TextFormat.split(callback, '.'); + for (int i = 0; i < mods.length - 1; i++) + jso = (JSObject) jso.getMember(mods[i]); + callback = mods[mods.length - 1]; + } + jso.call(callback, data); + } } catch (Exception e) { if (!haveNotifiedError) if (Logger.debugging) { Modified: branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2012-04-23 03:21:04 UTC (rev 17035) +++ branches/v12_2/Jmol/src/org/jmol/viewer/Jmol.properties 2012-04-23 03:22:59 UTC (rev 17036) @@ -6,6 +6,7 @@ version=12.2.23_dev +# bug fix: callback functions for modular calls: applet0.readCallback(....) # bug fix: Molden reader problems reading frequencies # bug fix: VASP reader with {n n n} and vibration vectors problem # bug fix: in 2bat, SIA was considered part of the carbohydrate chain because we were not checking bonding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |