svn commit: r646528 - /myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js

[gc...@apache.org]

Author: gcrawford
Date: Wed Apr  9 13:51:11 2008
New Revision: 646528

URL: http://svn.apache.org/viewvc?rev=646528&view=rev
Log:
TRINIDAD-1036  Client Color Converter's getFormatHint() and DateRestrictionValidator return empty string for hints.

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?rev=646528&r1=646527&r2=646528&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js Wed Apr  9 13:51:11 2008
@@ -2874,8 +2874,7 @@
     var currValue = tokens[currToken];
 
     // if the token has no value 
-    // or !typeof string, replace it with the empty string (see TRINIDAD-873)
-    if (!currValue || !(typeof currValue == "string"))
+    if (!currValue)
     {
       currValue = "";
     }
@@ -2883,8 +2882,12 @@
     // TRINIDAD-829:
     // we replace '{' and '}' to ensure, that tokens containing values
     // like {3} aren't parsed more than once...
+    // Only do this if it is typeof string (see TRINIDAD-873)
+    if (typeof currValue == "string")
+    {
     currValue = currValue.replace("{","{'");
     currValue = currValue.replace("}","'}");
+    }
 
     // the tokens are delimited by '{' before and '}' after the token
     var currRegExp = "{" + currToken + "}";