incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r483789 - in /incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml: StyleSheetRenderer.java XhtmlUtils.java
Date Fri, 08 Dec 2006 02:36:29 GMT
Author: jwaldman
Date: Thu Dec  7 18:36:28 2006
New Revision: 483789

URL: http://svn.apache.org/viewvc?view=rev&rev=483789
Log:
ADFFACES-231 URL encoding. Apply for Scott.
Patch 5.
For branch jwaldman-portal

Modified:
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
    incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java?view=diff&rev=483789&r1=483788&r2=483789
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
Thu Dec  7 18:36:28 2006
@@ -103,7 +103,7 @@
                         "charset=\\\"UTF-8\\\" type=\\\"text/css\\\" " +
                         "href=\\\"",
 						null);
-          String uri = context.getExternalContext().encodeActionURL(baseURL+href);
+          String uri = context.getExternalContext().encodeResourceURL(baseURL+href);
           writer.writeText(uri, null);
           writer.writeText("\\\">\")}", null);
           writer.endElement("script");

Modified: incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java?view=diff&rev=483789&r1=483788&r2=483789
==============================================================================
--- incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
(original)
+++ incubator/adffaces/branches/jwaldman-portal/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
Thu Dec  7 18:36:28 2006
@@ -159,6 +159,8 @@
     // each script once.  Employ document.write() to achieve this
     // effect.  (Note that on Netscape 4.x this caused major
     // problems when resizing windows - but we're done with Netscape 4)
+    libURL = context.getExternalContext().encodeResourceURL(libURL.toString());
+
     if (XhtmlConstants.FACET_PORTLET.equals(arc.getOutputMode()))
     {
       if (arc.getProperties().get(_PORTLET_LIB_TABLE_KEY) == null)
@@ -186,8 +188,7 @@
     else
     {
       // The "safe" case: just write out the source
-      libURL = context.getExternalContext().encodeResourceURL(libURL.toString());
-      writer.writeURIAttribute("src", "about:blank", null);
+      writer.writeURIAttribute("src", libURL, null);
     }
 
     writer.endElement("script");



Mime
View raw message