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:37:14 UTC
svn commit: r1097790 - in
/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html:
HtmlScriptRenderer.java HtmlStylesheetRenderer.java
Author: lu4242
Date: Fri Apr 29 12:37:14 2011
New Revision: 1097790
URL: http://svn.apache.org/viewvc?rev=1097790&view=rev
Log:
MYFACES-3120 Use ExternalContext.encodeResourceUrl for stylesheet and script links
Modified:
myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
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/HtmlScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java?rev=1097790&r1=1097789&r2=1097790&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java Fri Apr 29 12:37:14 2011
@@ -207,7 +207,7 @@ public class HtmlScriptRenderer extends
// We can't render the content type, because usually it returns "application/x-javascript"
// and this is not compatible with IE. We should force render "text/javascript".
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
- writer.writeURIAttribute(HTML.SRC_ATTR, resource.getRequestPath(), null);
+ writer.writeURIAttribute(HTML.SRC_ATTR, facesContext.getExternalContext().encodeResourceURL(resource.getRequestPath()), null);
writer.endElement(HTML.SCRIPT_ELEM);
}
}
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=1097790&r1=1097789&r2=1097790&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:37:14 2011
@@ -215,7 +215,7 @@ public class HtmlStylesheetRenderer exte
writer.writeAttribute(HTML.TYPE_ATTR,
(resource.getContentType() == null ? HTML.STYLE_TYPE_TEXT_CSS
: resource.getContentType()) , null);
- writer.writeURIAttribute(HTML.HREF_ATTR, resource.getRequestPath(), null);
+ writer.writeURIAttribute(HTML.HREF_ATTR, facesContext.getExternalContext().encodeResourceURL(resource.getRequestPath()), null);
writer.endElement(HTML.LINK_ELEM);
}
}