You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2008/05/21 16:10:33 UTC

svn commit: r658694 - /myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java

Author: weber
Date: Wed May 21 07:10:33 2008
New Revision: 658694

URL: http://svn.apache.org/viewvc?rev=658694&view=rev
Log:
(TOBAGO-653) Create a own JsonResponseWriter for dojo ajax requests
<http://issues.apache.org/jira/browse/TOBAGO-653>
    escape some chars in ajax case (tip attribute)

Modified:
    myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java

Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java?rev=658694&r1=658693&r2=658694&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java Wed May 21 07:10:33 2008
@@ -54,6 +54,8 @@
 import org.apache.myfaces.tobago.util.LayoutUtil;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriterWrapper;
+import org.apache.myfaces.tobago.webapp.TobagoResponseJsonWriterImpl;
+import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
@@ -691,14 +693,22 @@
   public static void renderTip(UIComponent component, TobagoResponseWriter writer) throws IOException {
     Object objTip = component.getAttributes().get(ATTR_TIP);
     if (objTip != null) {
-      writer.writeAttribute(HtmlAttributes.TITLE, String.valueOf(objTip), true);
+      String tip = String.valueOf(objTip);
+      if (writer instanceof TobagoResponseJsonWriterImpl) {
+        tip = AjaxUtils.encodeJavascriptString(tip);
+      }
+      writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
     }
   }
 
   public static void renderImageTip(UIComponent component, TobagoResponseWriter writer) throws IOException {
     Object objTip = component.getAttributes().get(ATTR_TIP);
     if (objTip != null) {
-      writer.writeAttribute(HtmlAttributes.ALT, String.valueOf(objTip), true);
+      String tip = String.valueOf(objTip);
+      if (writer instanceof TobagoResponseJsonWriterImpl) {
+        tip = AjaxUtils.encodeJavascriptString(tip);
+      }
+      writer.writeAttribute(HtmlAttributes.ALT, tip, true);
     } else {
       writer.writeAttribute(HtmlAttributes.ALT, "", false);
     }