Author: thomas.heute(a)jboss.com Date: 2008-06-12 07:59:53 -0400 (Thu, 12 Jun 2008) New Revision: 10997 Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java Log: CF fixing Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-12 09:51:29 UTC (rev 10996) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-12 11:59:53 UTC (rev 10997) @@ -160,9 +160,6 @@ } } - // Hack for JSF postBack :-/ Not sure why it's needed though - url.append("&").append("javax.faces.ViewState").append("=").append(faces.getExternalContext().getRequestParameterMap().get("javax.faces.ViewState")); - // return url.toString(); } Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-06-12 09:51:29 UTC (rev 10996) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/PortletHandler.java 2008-06-12 11:59:53 UTC (rev 10997) @@ -95,18 +95,6 @@ }; } } - if ("onClick".equals(name)) - { - final String s = attribute.getValue(); - return new Metadata() - { - public void applyMetadata(FaceletContext ctx, Object instance) - { - UIPortlet portlet = (UIPortlet)instance; - portlet.setOnClick(s); - } - }; - } return null; } }); Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2008-06-12 09:51:29 UTC (rev 10996) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2008-06-12 11:59:53 UTC (rev 10997) @@ -253,7 +253,20 @@ public String getOnClick() { - return onClick; + if (onClick != null) + { + return onClick; + } + + // + ValueBinding vb = getValueBinding("onClick"); + if (vb != null) + { + return (String)vb.getValue(getFacesContext()); + } + + // + return null; } public void setOnClick(String onClick) @@ -545,7 +558,7 @@ writer.endElement("div"); // - if (onClick != null) + if (getOnClick() != null) { writer.startElement("script", this); writer.write(