You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/01/03 12:24:12 UTC

svn commit: r1555052 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java

Author: lofwyr
Date: Fri Jan  3 11:24:12 2014
New Revision: 1555052

URL: http://svn.apache.org/r1555052
Log:
TOBAGO-633 Portlet support
TOBAGO-1328 Page dimension
- Markup for portlets must only set, in portlet case

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=1555052&r1=1555051&r2=1555052&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Fri Jan  3 11:24:12 2014
@@ -163,7 +163,8 @@ public class PageRenderer extends PageRe
     final String viewId = facesContext.getViewRoot().getViewId();
     final String formAction = externalContext.encodeActionURL(viewHandler.getActionURL(facesContext, viewId));
     final String partialAction;
-    if (PortletUtils.isPortletApiAvailable() && response instanceof MimeResponse) {
+    final boolean portlet = PortletUtils.isPortletApiAvailable() && response instanceof MimeResponse;
+    if (portlet) {
       final MimeResponse mimeResponse = (MimeResponse) response;
       final ResourceURL resourceURL = mimeResponse.createResourceURL();
       partialAction = externalContext.encodeResourceURL(resourceURL.toString());
@@ -304,7 +305,7 @@ public class PageRenderer extends PageRe
       writer.endElement(HtmlElements.HEAD);
     }
 
-    if (PortletUtils.isPortletApiAvailable() && response instanceof MimeResponse) {
+    if (portlet) {
       writer.startElement(HtmlElements.DIV, page);
       writer.writeClassAttribute(Classes.create(page, Markup.PORTLET));
     } else {
@@ -428,7 +429,11 @@ public class PageRenderer extends PageRe
 //    page.encodeLayoutBegin(facesContext);
 
     writer.startElement(HtmlElements.DIV, page);
-    writer.writeClassAttribute(Classes.create(page, "content", Markup.PORTLET));
+    if (portlet) {
+      writer.writeClassAttribute(Classes.create(page, "content", Markup.PORTLET));
+    } else {
+      writer.writeClassAttribute(Classes.create(page, "content"));
+    }
     writer.writeIdAttribute(clientId + ComponentUtils.SUB_SEPARATOR + "content");
     final Style style = new Style(facesContext, page);
     // XXX position the div, so that the scrollable area is correct.