[richfaces-svn-commits] JBoss Rich Faces SVN: r15996 - branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: Alex.Kolonitsky
Date: 2009-11-25 10:44:24 -0500 (Wed, 25 Nov 2009)
New Revision: 15996

Modified:
   branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-8159
Demo: organizer example contains blank cells

Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2009-11-25 15:08:55 UTC (rev 15995)
+++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2009-11-25 15:44:24 UTC (rev 15996)
@@ -451,7 +451,7 @@
     public void writeFacetMarkup(FacesContext context, UIComponent component) throws IOException {
         Map<String, String> jsonMap = new HashMap();
         if (component.getChildCount() != 0) {
-            jsonMap.put("dayListMarkup", getMarkupScriptBody(context, component, true));
+            jsonMap.put("dayList", getMarkupScriptBody(context, component, true));
         }
 
         addFacetMarkupScriptBody(context, component, jsonMap, "optionalHeader");
@@ -462,7 +462,20 @@
         addFacetMarkupScriptBody(context, component, jsonMap, "header");
         addFacetMarkupScriptBody(context, component, jsonMap, "footer");
 
-        context.getResponseWriter().write(new JSONObject(jsonMap).toString());
+        context.getResponseWriter().write("{");
+        boolean isFirst = true;
+        for (Map.Entry<String, String> entry : jsonMap.entrySet()) {
+            if (isFirst) {
+                isFirst = false;
+            } else {
+                context.getResponseWriter().write(",");
+            }
+            context.getResponseWriter().write(entry.getKey() + MARKUP_SUFFIX);
+            context.getResponseWriter().write(":");
+            context.getResponseWriter().write(entry.getValue());
+
+        }
+        context.getResponseWriter().write("}");
     }
 
     private void addFacetMarkupScriptBody(FacesContext context, UIComponent component, Map<String, String> jsonMap, String facetName) throws IOException {