[Jmol-commits] SF.net SVN: jmol: [5564] trunk/Jmol/appletweb/Jmol.js

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

Revision: 5564
          http://svn.sourceforge.net/jmol/?rev=5564&view=rev
Author:   hansonr
Date:     2006-09-16 09:53:22 -0700 (Sat, 16 Sep 2006)

Log Message:
-----------
jmolScriptWait now always returns a string;
jmolScriptWaitAsArray now always returs an array;

Modified Paths:
--------------
    trunk/Jmol/appletweb/Jmol.js

Modified: trunk/Jmol/appletweb/Jmol.js
===================================================================
--- trunk/Jmol/appletweb/Jmol.js	2006-09-16 14:55:35 UTC (rev 5563)
+++ trunk/Jmol/appletweb/Jmol.js	2006-09-16 16:53:22 UTC (rev 5564)
@@ -1,4 +1,4 @@
-/* Jmol 11.0 script library Jmol.js (aka Jmol-11.js) 11:58 AM 9/14/2006
+/* Jmol 11.0 script library Jmol.js (aka Jmol-11.js) 11:24 AM 9/16/2006
 
     based on:
  *
@@ -45,6 +45,7 @@
 //            -- renamed Jmol-11.js from Jmol-new.js; JmolApplet.jar from JmolAppletProto.jar
 //	 	 renamed Jmol.js for Jmol 11 distribution
 //            -- modified jmolRestoreOrientation() to be immediate, no 1-second delay
+// bob hanson -- jmolScriptWait always returns a string -- 11:23 AM 9/16/2006
 
 var defaultdir = "."
 var defaultjar = "JmolApplet.jar"
@@ -1052,10 +1053,12 @@
 
 function jmolScriptWait(script, targetSuffix) {
   if(!targetSuffix)targetSuffix="0"
-  var ret=jmolScriptWaitAsArray(script, targetSuffix)
-//  if(typeof ret == "object" && ret.length > 0 
-//	&& ret[0].length > 0 && ret[0][0].length > 3)return ret[0][0][3];
-  return ret
+  var Ret=jmolScriptWaitAsArray(script, targetSuffix)
+  var s = ""
+  for(i=Ret.length;--i>=0;)
+  for(j=0;j< Ret[i].length;j++)
+	s+=Ret[i][j]+"\n"
+  return s
 }
 
 function jmolScriptWaitAsArray(script, targetSuffix) {
@@ -1064,22 +1067,15 @@
   jmolGetStatus("scriptEcho,scriptMessage,scriptStatus,scriptError",targetSuffix)
   if (script) {
     _jmolCheckBrowser();
-    if (targetSuffix == "all") {
-      with (_jmol) {
-	for (var i = 0; i < appletSuffixes.length; ++i) {
-	  var applet = _jmolGetApplet(appletSuffixes[i]);
-          if (applet) ret += applet.scriptWait(script);
-        }
-      }
-    } else {
-      var applet=_jmolGetApplet(targetSuffix);
-      if (applet) ret += applet.scriptWait(script);
-    }
+    var applet=_jmolGetApplet(targetSuffix);
+    if (applet) ret += applet.scriptWait(script);
+    ret = _jmolEvalJSON(ret,"jmolStatus")
+    if(typeof ret == "object")
+	return ret
   }
-  return _jmolEvalJSON(ret,"jmolStatus")
  }catch(e){
-  return ""
  }
+  return [[ret]]
 }
 
 


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