You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2012/09/28 22:50:27 UTC
svn commit: r1391648 -
/myfaces/trinidad/branches/ar_1940_2/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
Author: arobinson74
Date: Fri Sep 28 20:50:27 2012
New Revision: 1391648
URL: http://svn.apache.org/viewvc?rev=1391648&view=rev
Log:
TRINIDAD-2319
Clear the client ID from the rendering context before encoding the children
Modified:
myfaces/trinidad/branches/ar_1940_2/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
Modified: myfaces/trinidad/branches/ar_1940_2/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/ar_1940_2/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java?rev=1391648&r1=1391647&r2=1391648&view=diff
==============================================================================
--- myfaces/trinidad/branches/ar_1940_2/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java (original)
+++ myfaces/trinidad/branches/ar_1940_2/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPopupRenderer.java Fri Sep 28 20:50:27 2012
@@ -218,6 +218,9 @@ public class PanelPopupRenderer extends
writer.writeAttribute(XhtmlConstants.STYLE_ATTRIBUTE, style, null);
}
+ // Reset current clientId
+ rc.setCurrentClientId(null);
+
encodeAllChildren(context, component);
// Close skinnable content div
@@ -231,9 +234,6 @@ public class PanelPopupRenderer extends
// Close outer span
writer.endElement(XhtmlConstants.SPAN_ELEMENT);
-
- // Reset current clientId
- rc.setCurrentClientId(null);
}
protected void renderTrigger(