svn commit: r568408 - in /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert: ColorConverter.java DateTimeConverter.java

[aw...@apache.org]

Author: awiner
Date: Tue Aug 21 21:27:34 2007
New Revision: 568408

URL: http://svn.apache.org/viewvc?rev=568408&view=rev
Log:
TRINIDAD-96: Validators should be added incrementally, not set as a whole
- Final bit:  make color converter incrementally build the color formatting

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java?rev=568408&r1=568407&r2=568408&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/ColorConverter.java Tue Aug 21 21:27:34 2007
@@ -85,8 +85,10 @@
         buff.append(XhtmlUtils.escapeJS(getTransparentString(context)));
         buff.append("\";");
 
-        buff.append("var _cfs=new Object();");
-        buff.append("var _cfts=new Object();");
+        // only create the _cfs object if it doesn't exist, so we don't
+        // wipe out _cfs[xxx] values if we ppr the first color field on a
+        // page with multiple color fields.
+        buff.append("if(window['_cfs']==undefined){var _cfs=new Object();var _cfts=new Object();}");
       }
 
       String[] patterns = getPatterns();

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?rev=568408&r1=568407&r2=568408&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Tue Aug 21 21:27:34 2007
@@ -179,11 +179,10 @@
       if (requestMap.get(_PATTERN_WRITTEN_KEY) == null)
       {
         requestMap.put(_PATTERN_WRITTEN_KEY, Boolean.TRUE);
-        // only create the _dfs object if it doesn't exist. This is to
-        // make sure we don't have problems like bug 3448873 where we
+        // only create the _dfs object if it doesn't exist, so we don't
         // wipe out _dfs[xxx] values if we ppr the first date field on a
         // page with multiple date fields.
-        buff.append("if(window['_dfs'] == (void 0)){var _dfs=new Object();}");
+        buff.append("if(window['_dfs'] == undefined){var _dfs=new Object();}");
       }
 
       buff.append("_dfs[\"");