[Jmol-commits] SF.net SVN: jmol:[20056] trunk/Jmol/src/org/jmol/script

[<ha...@us...>]

Revision: 20056
          http://sourceforge.net/p/jmol/code/20056
Author:   hansonr
Date:     2014-10-12 23:29:52 +0000 (Sun, 12 Oct 2014)
Log Message:
-----------
JavaScript bug

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/script/FileLoadThread.java
    trunk/Jmol/src/org/jmol/script/ScriptEval.java

Modified: trunk/Jmol/src/org/jmol/script/FileLoadThread.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/FileLoadThread.java	2014-10-12 18:48:40 UTC (rev 20055)
+++ trunk/Jmol/src/org/jmol/script/FileLoadThread.java	2014-10-12 23:29:52 UTC (rev 20056)
@@ -107,7 +107,7 @@
    */
   void setData(String fileName, String fileName0, Object data, Object myData)
       throws InterruptedException {
-    System.out.println("FileLoadThread async setData " + fileName);
+    //System.out.println("FileLoadThread async setData " + fileName);
     boolean isCanceled = fileName.equals("#CANCELED#");
     sc.parentContext.htFileCache.put(key, (isCanceled ? fileName
         : (cacheName = cacheName.substring(0, cacheName.lastIndexOf("_") + 1)

Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java	2014-10-12 18:48:40 UTC (rev 20055)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java	2014-10-12 23:29:52 UTC (rev 20056)
@@ -6253,7 +6253,7 @@
             remotePath = paramAsStr(++i);
           filename = paramAsStr(++i);
         }
-        if (vwr.isJS || vwr.testAsync && (isAsync || filename.startsWith("?"))) {
+        if ((vwr.isJS || vwr.testAsync) && (isAsync || filename.startsWith("?"))) {
           filename = loadFileAsync("SCRIPT_", filename, i, true);
           // on first pass a ScriptInterruption will be thrown; 
           // on the second pass we will have the file name, which will be cache://local_n__m

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.