[Wonder-cvs] SF.net SVN: wonder:[8644] trunk/Wonder/Frameworks/Core/ERExtensions/Sources /er/extensions/appserver/ERXRedirect.java

[<ms...@us...>]

Revision: 8644
          http://wonder.svn.sourceforge.net/wonder/?rev=8644&view=rev
Author:   mschrag
Date:     2008-11-18 23:08:38 +0000 (Tue, 18 Nov 2008)

Log Message:
-----------
firefox actually prints out that #@$ javascript, so check for the existance of an update container id

Modified Paths:
--------------
    trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXRedirect.java

Modified: trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXRedirect.java
===================================================================
--- trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXRedirect.java	2008-11-18 23:07:59 UTC (rev 8643)
+++ trunk/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXRedirect.java	2008-11-18 23:08:38 UTC (rev 8644)
@@ -186,8 +186,17 @@
 		}
 
 		if (ERXAjaxApplication.isAjaxRequest(context.request())) {
-			response.setHeader("text/javascript", "Content-Type");
+			boolean hasUpdateContainer = context.request().stringFormValueForKey(ERXAjaxApplication.KEY_UPDATE_CONTAINER_ID) != null;
+			if (hasUpdateContainer) {
+				response.appendContentString("<script type=\"text/javascript\">");
+			}
+			else {
+				response.setHeader("text/javascript", "Content-Type");
+			}
 			response.appendContentString("document.location.href='" + url + "';");
+			if (hasUpdateContainer) {
+				response.appendContentString("</script>");
+			}
 		}
 		else {
 			response.setHeader(url, "location");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.