Author: abelevich
Date: 2007-11-26 10:54:49 -0500 (Mon, 26 Nov 2007)
New Revision: 4265
Modified:
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java
Log:
RF-1319 (if renderer=='false' doesn't encode styles or scripts)
Modified:
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java
===================================================================
---
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-11-26
15:52:26 UTC (rev 4264)
+++
trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/LoadResourceRendererBase.java 2007-11-26
15:54:49 UTC (rev 4265)
@@ -74,16 +74,22 @@
throw new FacesException("Source for resource is null for component
"+resource.getClientId(context));
}
LinkedHashSet set = new LinkedHashSet(1);
- String uri ;
+ String uri = null ;
if(src instanceof InternetResource){
uri=((InternetResource)src).getUri(context, resource);
} else {
// Process as ordinary url, same as for h:graphicsImage.
- uri=context.getApplication().getViewHandler().
- getResourceURL(context, src.toString());
- uri=context.getExternalContext().encodeResourceURL(uri);
+ if(resource.isRendered()){
+ uri=context.getApplication().getViewHandler().
+ getResourceURL(context, src.toString());
+ uri=context.getExternalContext().encodeResourceURL(uri);
+ }
}
- set.add(uri);
+
+ if (uri != null) {
+ set.add(uri);
+ }
+
return set;
}
Show replies by date