From b3785cfa77fdbd128fd7e7748d38b4f2454b18a7 Mon Sep 17 00:00:00 2001
From: Jeremy Grelle <jgrelle@vmware.com>
Date: Mon, 7 Apr 2008 15:21:46 +0000
Subject: [PATCH] - Removing "djConfig" attribute from Dojo <script> tag
 rendering since we don't need it for Spring Faces and it violates HTML
 validation. - Ensuring that all component-rendered <script> tags include a
 type="text/javascript" attribute.

---
 .../faces/ui/AjaxEventInterceptorRenderer.java              | 1 +
 .../java/org/springframework/faces/ui/AjaxViewRoot.java     | 1 +
 .../faces/ui/BaseDojoParentComponentRenderer.java           | 6 +-----
 .../org/springframework/faces/ui/DojoAdvisorRenderer.java   | 1 +
 .../java/org/springframework/faces/ui/DojoRenderer.java     | 6 +-----
 .../faces/ui/ProgressiveCommandLinkRenderer.java            | 1 +
 .../org/springframework/faces/ui/ValidateAllRenderer.java   | 1 +
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java
index 5dd3bb04..da8447ce 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java
@@ -20,6 +20,7 @@ public class AjaxEventInterceptorRenderer extends DojoRenderer {
 
 		ResponseWriter writer = context.getResponseWriter();
 		writer.startElement("script", component);
+		writer.writeAttribute("type", "text/javascript", null);
 
 		String processIds = (String) component.getAttributes().get("processIds");
 		String renderIds = (String) component.getAttributes().get("renderIds");
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java
index 4c52bde8..754d4fce 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java
@@ -180,6 +180,7 @@ public class AjaxViewRoot extends DelegatingViewRoot {
 				String script = "dojo.byId('" + formId + "').action = '"
 						+ context.getApplication().getViewHandler().getActionURL(context, getViewId()) + "'";
 				writer.startElement("script", null);
+				writer.writeAttribute("type", "text/javascript", null);
 				writer.writeText(script, null);
 				writer.endElement("script");
 			}
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java
index 7042eeff..6063c4e3 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java
@@ -1,8 +1,6 @@
 package org.springframework.faces.ui;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -26,9 +24,7 @@ public abstract class BaseDojoParentComponentRenderer extends BaseSpringFacesPar
 
 		resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css");
 
-		Map dojoAttributes = new HashMap();
-		dojoAttributes.put("djConfig", "parseOnLoad: true");
-		resourceHelper.renderScriptLink(context, dojoJsResourceUri, dojoAttributes);
+		resourceHelper.renderScriptLink(context, dojoJsResourceUri);
 
 		resourceHelper.renderScriptLink(context, springDojoJsResourceUri);
 	}
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java
index 629466a5..8afde1c7 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java
@@ -46,6 +46,7 @@ public class DojoAdvisorRenderer extends DojoRenderer {
 		resourceHelper.renderDojoInclude(context, ((DojoAdvisor) component).getDojoComponentType());
 
 		writer.startElement(SCRIPT_ELEMENT, component);
+		writer.writeAttribute("type", "text/javascript", null);
 		StringBuffer script = new StringBuffer();
 		script.append("  Spring.advisors.push(new Spring.ValidatingFieldAdvisor({  ");
 		script.append("  targetElId : '" + advisedChild.getClientId(context) + "',  ");
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java
index 3bce8595..f9e62482 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java
@@ -16,8 +16,6 @@
 package org.springframework.faces.ui;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -42,9 +40,7 @@ public class DojoRenderer extends SpringFacesRenderer {
 
 		resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css");
 
-		Map dojoAttributes = new HashMap();
-		dojoAttributes.put("djConfig", "parseOnLoad: true");
-		resourceHelper.renderScriptLink(context, dojoJsResourceUri, dojoAttributes);
+		resourceHelper.renderScriptLink(context, dojoJsResourceUri);
 
 		resourceHelper.renderScriptLink(context, springDojoJsResourceUri);
 	}
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
index c846af60..3502e4b7 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandLinkRenderer.java
@@ -74,6 +74,7 @@ public class ProgressiveCommandLinkRenderer extends ProgressiveCommandButtonRend
 			// Now render the link's HTML into a javascript variable
 			ResponseWriter writer = context.getResponseWriter();
 			writer.startElement("script", component);
+			writer.writeAttribute("type", "text/javascript", null);
 			String scriptVarStart = "var " + component.getClientId(context).replaceAll(":", "_") + "_link = \"";
 			writer.writeText(scriptVarStart, null);
 			writer = new DoubleQuoteEscapingWriter(writer);
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
index 614a459f..766d5d0a 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java
@@ -42,6 +42,7 @@ public class ValidateAllRenderer extends SpringFacesRenderer {
 		UIComponent advisedChild = (UIComponent) component.getChildren().get(0);
 
 		writer.startElement(SCRIPT_ELEMENT, component);
+		writer.writeAttribute("type", "text/javascript", null);
 		StringBuffer script = new StringBuffer();
 		script.append("Spring.advisors.push(new Spring.ValidateAllAdvisor({" + "event : 'onclick', " + "targetId : '"
 				+ advisedChild.getClientId(context) + "'}));");