From richfaces-svn-commits at lists.jboss.org Thu Jan 13 14:31:59 2011
Content-Type: multipart/mixed; boundary="===============2649483287554875022=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r21003 - in trunk:
 ui/output/ui/src/main/java/org/richfaces/renderkit/html and 1 other
 directory.
Date: Thu, 13 Jan 2011 14:31:58 -0500
Message-ID: <201101131931.p0DJVwV9013829@svn01.web.mwc.hst.phx2.redhat.com>

--===============2649483287554875022==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: artdaw
Date: 2011-01-13 14:31:58 -0500 (Thu, 13 Jan 2011)
New Revision: 21003

Modified:
   trunk/examples/output-demo/src/main/webapp/examples/toolbar.xhtml
   trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRen=
dererBase.java
Log:
RF-10210: Character entity reference &nbsp; is replaced with numeric "\u00a=
0" since it brakes XHTML

Modified: trunk/examples/output-demo/src/main/webapp/examples/toolbar.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/examples/output-demo/src/main/webapp/examples/toolbar.xhtml	2011-=
01-13 18:01:32 UTC (rev 21002)
+++ trunk/examples/output-demo/src/main/webapp/examples/toolbar.xhtml	2011-=
01-13 19:31:58 UTC (rev 21003)
@@ -3,77 +3,86 @@
       xmlns:ui=3D"http://java.sun.com/jsf/facelets"
       xmlns:f=3D"http://java.sun.com/jsf/core"
       xmlns:h=3D"http://java.sun.com/jsf/html"
-      xmlns:tb=3D"http://richfaces.org/output">
-    <h:head>
-        <title>toolbar sample</title>
-        <style>
-          =

-        </style>        =

-    </h:head>
-    <h:body>
-        <tb:toolbar height=3D"45" itemSeparator=3D"grid" itemStyle=3D"colo=
r:red;" itemClass=3D"custom-item">
+      xmlns:tb=3D"http://richfaces.org/output" xmlns:a4j=3D"http://richfac=
es.org/a4j">
+<f:view contentType=3D"application/xhtml+xml">
+<h:head>
+    <title>toolbar sample</title>
+    <style>
+
+    </style>
+</h:head>
+
+<h:body>
+    <tb:toolbar id=3D"tb" height=3D"45" itemSeparator=3D"grid" itemStyle=
=3D"color:red;" itemClass=3D"custom-item">
         <f:facet name=3D"itemSeparator">
             ||
-        </f:facet>      =

-          <tb:toolbarGroup itemStyle=3D"border: 1px solid green" itemClass=
=3D"custom-item-group" itemSeparator=3D"line" onitemclick=3D"22">
-              <h:graphicImage value=3D"/images/icons/create_doc.gif"/>
-              <a href=3D"#">link 1</a> Text
-              <a href=3D"#">link 2</a>
-              <h:graphicImage value=3D"/images/icons/create_folder.gif" on=
click=3D"q1"/>
-              <h:graphicImage value=3D"/images/icons/copy.gif"/>
-              <a href=3D"#">link 3</a> Text
-              <a href=3D"#">link 4</a>
-          </tb:toolbarGroup>
-          <tb:toolbarGroup itemSeparator=3D"none">
-              <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"=
q2"/>
-              <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"=
q2"/>
-              <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"=
q2"/>
-              <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"=
q2"/>
-          </tb:toolbarGroup>
-          <tb:toolbarGroup itemSeparator=3D"line">
-              <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"=
q2"/>
-              <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"=
q2"/>
-          </tb:toolbarGroup>
-          =

-          <tb:toolbarGroup location=3D"right" itemSeparator=3D"square">
-              <h:graphicImage value=3D"/images/icons/find.gif" />
-              <h:graphicImage value=3D"/images/icons/filter.gif" />
-          </tb:toolbarGroup>
-        </tb:toolbar>
-        <br/>
-        <tb:toolbar itemSeparator=3D"grid" itemStyle=3D"border: 1px solid =
green" itemClass=3D"custom-item">
-          <tb:toolbarGroup itemSeparator=3D"line" itemStyle=3D"border: 1px=
 solid green" itemClass=3D"custom-item-group">
-              <h:graphicImage value=3D"/images/icons/create_doc.gif"/>
-              <h:graphicImage value=3D"/images/icons/create_folder.gif"/>
-              <h:graphicImage value=3D"/images/icons/copy.gif"/>
-          </tb:toolbarGroup>
-          <tb:toolbarGroup itemSeparator=3D"disc">
-              <h:graphicImage value=3D"/images/icons/save.gif"/>
-              <h:graphicImage value=3D"/images/icons/save_as.gif"/>
-              <h:graphicImage value=3D"/images/icons/save_all.gif"/>
-          </tb:toolbarGroup>
-          <tb:toolbarGroup location=3D"right" itemSeparator=3D"square">
-              <h:graphicImage value=3D"/images/icons/find.gif"/>
-              <h:graphicImage value=3D"/images/icons/filter.gif"/>
-          </tb:toolbarGroup>
-        </tb:toolbar>     =

-        =

-        <br/>
-        <tb:toolbar height=3D"26" itemSeparator=3D"grid">
-          <tb:toolbarGroup itemSeparator=3D"line">
-              <h:graphicImage value=3D"/images/icons/create_doc.gif"/>
-              <h:graphicImage value=3D"/images/icons/create_folder.gif"/>
-              <h:graphicImage value=3D"/images/icons/copy.gif"/>
-          </tb:toolbarGroup>
-          <tb:toolbarGroup itemSeparator=3D"disc">
-              <h:graphicImage value=3D"/images/icons/save.gif"/>
-              <h:graphicImage value=3D"/images/icons/save_as.gif"/>
-              <h:graphicImage value=3D"/images/icons/save_all.gif"/>
-          </tb:toolbarGroup>
-          <tb:toolbarGroup location=3D"right" itemSeparator=3D"square">
-              <h:graphicImage value=3D"/images/icons/find.gif"/>
-              <h:graphicImage value=3D"/images/icons/filter.gif"/>
-          </tb:toolbarGroup>
-        </tb:toolbar> =

-    </h:body>
+        </f:facet>
+        <tb:toolbarGroup itemStyle=3D"border: 1px solid green" itemClass=
=3D"custom-item-group" itemSeparator=3D"line"
+                         onitemclick=3D"22">
+            <h:graphicImage value=3D"/images/icons/create_doc.gif"/>
+            <a href=3D"#">link 1</a> Text
+            <a href=3D"#">link 2</a>
+            <h:graphicImage value=3D"/images/icons/create_folder.gif" oncl=
ick=3D"q1"/>
+            <h:graphicImage value=3D"/images/icons/copy.gif"/>
+            <a href=3D"#">link 3</a> Text
+            <a href=3D"#">link 4</a>
+        </tb:toolbarGroup>
+        <tb:toolbarGroup itemSeparator=3D"none">
+            <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"q2=
"/>
+            <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"q2=
"/>
+            <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"q2=
"/>
+            <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"q2=
"/>
+        </tb:toolbarGroup>
+        <tb:toolbarGroup itemSeparator=3D"line">
+            <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"q2=
"/>
+            <h:graphicImage value=3D"/images/icons/save.gif" onclick=3D"q2=
"/>
+        </tb:toolbarGroup>
+
+        <tb:toolbarGroup location=3D"right" itemSeparator=3D"square">
+            <h:graphicImage value=3D"/images/icons/find.gif"/>
+            <h:graphicImage value=3D"/images/icons/filter.gif"/>
+        </tb:toolbarGroup>
+    </tb:toolbar>
+    <br/>
+    <tb:toolbar itemSeparator=3D"grid" itemStyle=3D"border: 1px solid gree=
n" itemClass=3D"custom-item">
+        <tb:toolbarGroup itemSeparator=3D"line" itemStyle=3D"border: 1px s=
olid green" itemClass=3D"custom-item-group">
+            <h:graphicImage value=3D"/images/icons/create_doc.gif"/>
+            <h:graphicImage value=3D"/images/icons/create_folder.gif"/>
+            <h:graphicImage value=3D"/images/icons/copy.gif"/>
+        </tb:toolbarGroup>
+        <tb:toolbarGroup itemSeparator=3D"disc">
+            <h:graphicImage value=3D"/images/icons/save.gif"/>
+            <h:graphicImage value=3D"/images/icons/save_as.gif"/>
+            <h:graphicImage value=3D"/images/icons/save_all.gif"/>
+        </tb:toolbarGroup>
+        <tb:toolbarGroup location=3D"right" itemSeparator=3D"square">
+            <h:graphicImage value=3D"/images/icons/find.gif"/>
+            <h:graphicImage value=3D"/images/icons/filter.gif"/>
+        </tb:toolbarGroup>
+    </tb:toolbar>
+
+    <br/>
+    <tb:toolbar height=3D"26" itemSeparator=3D"grid">
+        <tb:toolbarGroup itemSeparator=3D"line">
+            <h:graphicImage value=3D"/images/icons/create_doc.gif"/>
+            <h:graphicImage value=3D"/images/icons/create_folder.gif"/>
+            <h:graphicImage value=3D"/images/icons/copy.gif"/>
+        </tb:toolbarGroup>
+        <tb:toolbarGroup itemSeparator=3D"disc">
+            <h:graphicImage value=3D"/images/icons/save.gif"/>
+            <h:graphicImage value=3D"/images/icons/save_as.gif"/>
+            <h:graphicImage value=3D"/images/icons/save_all.gif"/>
+        </tb:toolbarGroup>
+        <tb:toolbarGroup location=3D"right" itemSeparator=3D"square">
+            <h:graphicImage value=3D"/images/icons/find.gif"/>
+            <h:graphicImage value=3D"/images/icons/filter.gif"/>
+        </tb:toolbarGroup>
+    </tb:toolbar>
+
+    <h:form>
+        <a4j:commandLink value=3D"Ajax Rerender Toolbar" render=3D"tb" />
+        <a4j:log />
+    </h:form>
+</h:body>
+</f:view>
 </html>
\ No newline at end of file

Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/Too=
lbarRendererBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRe=
ndererBase.java	2011-01-13 18:01:32 UTC (rev 21002)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRe=
ndererBase.java	2011-01-13 19:31:58 UTC (rev 21003)
@@ -244,7 +244,7 @@
 =

             writer.startElement(HtmlConstants.TD_ELEM, component);
             writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, concatCla=
sses("rf-tb-emp", itemClass), null);
-            writer.write("&nbsp;");
+            writer.writeText("\u00a0", null);
             writer.endElement(HtmlConstants.TD_ELEM);
 =

             for (Iterator<UIComponent> it =3D childrenToTheRight.iterator(=
); it.hasNext();) {
@@ -326,7 +326,7 @@
                 String itemSeparatorClass =3D "rf-tb-sep-" + separator.toS=
tring().toLowerCase();
                 writer.startElement(HtmlConstants.DIV_ELEM, component);
                 writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, itemS=
eparatorClass, null);
-                writer.write("&nbsp;");
+                writer.writeText("\u00a0", null);
                 writer.endElement(HtmlConstants.DIV_ELEM);
             } else {
                 =



--===============2649483287554875022==--