Author: nbelaevski Date: 2010-02-21 18:24:35 -0500 (Sun, 21 Feb 2010) New Revision: 16481 Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml Log: TODOs & fixes for CDK https://jira.jboss.org/jira/browse/RF-8310 Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java 2010-02-21 23:23:03 UTC (rev 16480) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxOutputPanelRenderer.java 2010-02-21 23:24:35 UTC (rev 16481) @@ -63,7 +63,7 @@ for (UIComponent child : component.getChildren()) { String childId = child.getClientId(context); if (child.isRendered()) { - renderChild(context, child); + child.encodeAll(context); } else { // Render "dummy" span. ResponseWriter out = context.getResponseWriter(); Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2010-02-21 23:23:03 UTC (rev 16480) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2010-02-21 23:24:35 UTC (rev 16481) @@ -14,9 +14,9 @@ <cc:implementation> <input id="#{clientId}" name="#{clientId}" - cdk:passThroughWithExclusions="type" onclick="#{this.getOnClick(facesContext,cc)}" - value="#{cc.attributes['value']}"> - <cdk:call expression="encodeTypeAndImage(facesContext,cc);" /> + cdk:passThroughWithExclusions="type" onclick="#{this.getOnClick(facesContext, component)}" + value="#{component.attributes['value']}"> + <cdk:call expression="encodeTypeAndImage(facesContext, component);" /> </input> </cc:implementation> </cdk:root> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2010-02-21 23:23:03 UTC (rev 16480) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2010-02-21 23:24:35 UTC (rev 16481) @@ -14,7 +14,7 @@ <cc:implementation> <span id="#{clientId}" style="display: none;"> <script type="text/javascript"> - #{this.getFunction(facesContext, cc)}; + #{this.getFunction(facesContext, component)}; </script> </span> </cc:implementation> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2010-02-21 23:23:03 UTC (rev 16480) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2010-02-21 23:24:35 UTC (rev 16481) @@ -13,13 +13,14 @@ <cc:implementation> <a id="#{clientId}" name="#{clientId}" - cdk:passThroughWithExclusions="value" onclick="#{this.getOnClick(facesContext, cc)}" + cdk:passThroughWithExclusions="value" onclick="#{this.getOnClick(facesContext, component)}" href="#"> - #{cc.attributes['value']} + #{component.attributes['value']} <cdk:body> - <cdk:call expression="renderChildren(facesContext, cc);" /> + <cdk:call expression="renderChildren(facesContext, component);" /> </cdk:body> </a> + <div></div> </cc:implementation> </cdk:root> Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml =================================================================== --- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2010-02-21 23:23:03 UTC (rev 16480) +++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2010-02-21 23:24:35 UTC (rev 16481) @@ -27,9 +27,9 @@ LOG.LEVEL = LOG.#{component.attributes["level"]}; </script> </div> </cdk:otherwise> </cdk:choose --> - <div id="richfaces.log" class="rich-log #{cc.attributes['styleClass']}"> + <div id="richfaces.log" class="rich-log #{component.attributes['styleClass']}"> <script type="text/javascript"> - RichFaces.log.setLevel("#{cc.attributes['level']}"); + RichFaces.log.setLevel("#{component.attributes['level']}"); </script> </div> </cc:implementation>