diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java index 8b4a6fc4..29252032 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java @@ -22,6 +22,7 @@ import javax.faces.context.FacesContext; import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; +import org.springframework.faces.webflow.JsfUtils; /** * Base {@link Renderer} for components that require the Dojo implementation of Spring JavaScript to be available on the @@ -45,11 +46,13 @@ public abstract class BaseDojoComponentRenderer extends BaseSpringJavascriptComp public void encodeBegin(FacesContext context, UIComponent component) throws IOException { super.encodeBegin(context, component); - resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); + if (!JsfUtils.isAsynchronousFlowRequest()) { + resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); - resourceHelper.renderScriptLink(context, dojoJsResourceUri); + resourceHelper.renderScriptLink(context, dojoJsResourceUri); - resourceHelper.renderScriptLink(context, springDojoJsResourceUri); + resourceHelper.renderScriptLink(context, springDojoJsResourceUri); + } } } diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java index bb8c857c..f29063ba 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java @@ -22,6 +22,7 @@ import javax.faces.context.FacesContext; import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; +import org.springframework.faces.webflow.JsfUtils; /** * Base {@link Renderer} for components that require the Spring JavaScript library on the client. @@ -39,6 +40,8 @@ public abstract class BaseSpringJavascriptComponentRenderer extends BaseComponen super.encodeBegin(context, component); - resourceHelper.renderScriptLink(context, springJsResourceUri); + if (!JsfUtils.isAsynchronousFlowRequest()) { + resourceHelper.renderScriptLink(context, springJsResourceUri); + } } } diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java index ad63b486..f439aae3 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java @@ -22,6 +22,7 @@ import javax.faces.context.FacesContext; import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; +import org.springframework.faces.webflow.JsfUtils; public abstract class BaseSpringJavascriptDecorationRenderer extends Renderer { @@ -31,7 +32,9 @@ public abstract class BaseSpringJavascriptDecorationRenderer extends Renderer { public void encodeBegin(FacesContext context, UIComponent component) throws IOException { - resourceHelper.renderScriptLink(context, springJsResourceUri); + if (!JsfUtils.isAsynchronousFlowRequest()) { + resourceHelper.renderScriptLink(context, springJsResourceUri); + } } } diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java index f2b707d0..2ee97b4a 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java @@ -25,6 +25,7 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import org.springframework.faces.ui.resource.ResourceHelper; +import org.springframework.faces.webflow.JsfUtils; import org.springframework.util.StringUtils; /** @@ -52,11 +53,13 @@ public class DojoDecorationRenderer extends BaseSpringJavascriptDecorationRender super.encodeBegin(context, component); - resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); + if (!JsfUtils.isAsynchronousFlowRequest()) { + resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); - resourceHelper.renderScriptLink(context, dojoJsResourceUri); + resourceHelper.renderScriptLink(context, dojoJsResourceUri); - resourceHelper.renderScriptLink(context, springDojoJsResourceUri); + resourceHelper.renderScriptLink(context, springDojoJsResourceUri); + } } public void encodeEnd(FacesContext context, UIComponent component) throws IOException {