Revision: 20541
http://sourceforge.net/p/jmol/code/20541
Author: hansonr
Date: 2015-06-02 00:38:52 +0000 (Tue, 02 Jun 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.14_2015.06.01b"
bug fix: unncessary dialog with LOAD ? when using JSmol/HTML5
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/FileManager.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/viewer/FileManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/FileManager.java 2015-06-01 22:27:49 UTC
(rev 20540)
+++ trunk/Jmol/src/org/jmol/viewer/FileManager.java 2015-06-02 00:38:52 UTC
(rev 20541)
@@ -966,7 +966,7 @@
return new String[] { null };
boolean doSetPathForAllFiles = (pathForAllFiles.length() > 0);
if (name.startsWith("?") || name.startsWith("http://?";)) {
- if ((name = vwr.dialogAsk("Load", name, null)) == null)
+ if (!vwr.isJS && (name = vwr.dialogAsk("Load", name, null)) == null)
return new String[] { isFullLoad ? "#CANCELED#" : null };
doSetPathForAllFiles = false;
}
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-06-01 22:27:49 UTC
(rev 20540)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-06-02 00:38:52 UTC
(rev 20541)
@@ -14,8 +14,12 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.3.14_2015.06.01"
+Jmol.___JmolVersion="14.3.14_2015.06.01b"
+bug fix: unncessary dialog with LOAD ? when using JSmol/HTML5
+
+JmolVersion="14.3.14_2015.06.01"
+
new feature: preliminary AFLOW AaBb binary file reader
- see http://www.aflowlib.org/binary_alloys.php
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
