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

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

Revision: 11028
          http://jmol.svn.sourceforge.net/jmol/?rev=11028&view=rev
Author:   hansonr
Date:     2009-06-14 16:17:35 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
proposed changes for Angel.

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

Modified: trunk/Jmol/appletweb/Jmol.js
===================================================================
--- trunk/Jmol/appletweb/Jmol.js	2009-06-14 16:14:30 UTC (rev 11027)
+++ trunk/Jmol/appletweb/Jmol.js	2009-06-14 16:17:35 UTC (rev 11028)
@@ -990,10 +990,10 @@
   var sx = "" + x;
   return (sx.indexOf("%") == sx.length-1 ? sx 
   	: (x = parseFloat(x)) < 0 ? "" 
+  	: isNaN(x) ? _jmol.allowedJmolSize[2]
   	: x <= 1 && x > 0 ? x * 100 + "%"
   	: (x = Math.floor(x)) < _jmol.allowedJmolSize[0] ? _jmol.allowedJmolSize[0]
   	: x > _jmol.allowedJmolSize[1] ? _jmol.allowedJmolSize[1] 
-  	: isNaN(x) ? _jmol.allowedJmolSize[2]
 	: x);
 }
 


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