You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/04/29 14:39:21 UTC

svn commit: r1097792 - /myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java

Author: lu4242
Date: Fri Apr 29 12:39:21 2011
New Revision: 1097792

URL: http://svn.apache.org/viewvc?rev=1097792&view=rev
Log:
MYFACES-3121 Add media attribute to h:outputStylesheet

Modified:
    myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java

Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java?rev=1097792&r1=1097791&r2=1097792&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java Fri Apr 29 12:39:21 2011
@@ -211,7 +211,8 @@ public class HtmlStylesheetRenderer exte
             ResponseWriter writer = facesContext.getResponseWriter();
             writer.startElement(HTML.LINK_ELEM, component);
             writer.writeAttribute(HTML.REL_ATTR, HTML.STYLESHEET_VALUE,null );
-            writer.writeAttribute("media", "screen",null );            
+            String media = (String) component.getAttributes().get("media");
+            writer.writeAttribute("media", media == null ? "screen" : media ,null );
             writer.writeAttribute(HTML.TYPE_ATTR, 
                     (resource.getContentType() == null ? HTML.STYLE_TYPE_TEXT_CSS
                             : resource.getContentType()) , null);