svn commit: r517239 - /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java

[lo...@apache.org]

Author: lofwyr
Date: Mon Mar 12 08:06:46 2007
New Revision: 517239

URL: http://svn.apache.org/viewvc?view=rev&rev=517239
Log:
Affects TOBAGO-317
Confirmation does now work with link.

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java?view=diff&rev=517239&r1=517238&r2=517239
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java Mon Mar 12 08:06:46 2007
@@ -747,20 +747,23 @@
     return onclick;
   }
 
-  public static String appendConfirmationScript(String onclick,
-      UIComponent component, FacesContext facesContext) {
-    ValueHolder confirmation
-        = (ValueHolder) component.getFacet(TobagoConstants.FACET_CONFIRMATION);
+  @Deprecated
+  public static String appendConfirmationScript(String onclick, UIComponent component, FacesContext facesContext) {
+    return appendConfirmationScript(onclick, component);
+  }
+
+  public static String appendConfirmationScript(String onclick, UIComponent component) {
+    ValueHolder confirmation = (ValueHolder) component.getFacet(TobagoConstants.FACET_CONFIRMATION);
     if (confirmation != null) {
+      StringBuilder script = new StringBuilder();
+      script.append("confirm('");
+      script.append(confirmation.getValue());
+      script.append("')");
       if (onclick != null) {
-        onclick = "confirm('" + confirmation.getValue() + "') && " + onclick;
-      } else {
-        if (LOG.isWarnEnabled()) {
-          LOG.warn("Facet '" + TobagoConstants.FACET_CONFIRMATION + "' is not supported for "
-              + "this type of button. id = '"
-              + component.getClientId(facesContext) + "'");
-        }
+        script.append(" && ");
+        script.append(onclick);
       }
+      onclick = script.toString();
     }
     return onclick;
   }