You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/05/25 21:44:22 UTC
svn commit: r948189 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
Author: jakobk
Date: Tue May 25 19:44:22 2010
New Revision: 948189
URL: http://svn.apache.org/viewvc?rev=948189&view=rev
Log:
MYFACES-2736 Do not render CDATA section on UIDebug's JavaScript for partial requests
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java?rev=948189&r1=948188&r2=948189&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java Tue May 25 19:44:22 2010
@@ -96,24 +96,30 @@ public final class UIDebug extends UICom
public void encodeBegin(FacesContext faces) throws IOException
{
-
- String actionId = faces.getApplication().getViewHandler().getActionURL(faces, faces.getViewRoot().getViewId());
-
+ boolean partialRequest = faces.getPartialViewContext().isPartialRequest();
+
+ String actionId = faces.getApplication().getViewHandler()
+ .getActionURL(faces, faces.getViewRoot().getViewId());
+
StringBuilder sb = new StringBuilder(512);
sb.append("<script language=\"javascript\" type=\"text/javascript\">\n");
- sb.append("//<![CDATA[\n");
- sb
- .append("function faceletsDebug(URL) { day = new Date(); id = day.getTime(); eval(\"page\" + id + \" = window.open(URL, '\" + id + \"', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=800,height=600,left = 240,top = 212');\"); };");
- sb
- .append("var faceletsOrigKeyup = document.onkeyup; document.onkeyup = function(e) { if (window.event) e = window.event; if (String.fromCharCode(e.keyCode) == '"
- + this.getHotkey() + "' & e.shiftKey & e.ctrlKey) faceletsDebug('");
+ if (!partialRequest)
+ {
+ sb.append("//<![CDATA[\n");
+ }
+ sb.append("function faceletsDebug(URL) { day = new Date(); id = day.getTime(); eval(\"page\" + id + \" = window.open(URL, '\" + id + \"', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1,width=800,height=600,left = 240,top = 212');\"); };");
+ sb.append("var faceletsOrigKeyup = document.onkeyup; document.onkeyup = function(e) { if (window.event) e = window.event; if (String.fromCharCode(e.keyCode) == '"
+ + this.getHotkey() + "' & e.shiftKey & e.ctrlKey) faceletsDebug('");
sb.append(actionId);
sb.append('?');
sb.append(KEY);
sb.append('=');
sb.append(writeDebugOutput(faces));
sb.append("'); else if (faceletsOrigKeyup) faceletsOrigKeyup(e); };\n");
- sb.append("//]]>\n");
+ if (!partialRequest)
+ {
+ sb.append("//]]>\n");
+ }
sb.append("</script>\n");
ResponseWriter writer = faces.getResponseWriter();