You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/04/29 17:13:51 UTC

svn commit: r1477139 - in /myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag: DatePickerRenderer.java ToolBarRendererBase.java

Author: lofwyr
Date: Mon Apr 29 15:13:50 2013
New Revision: 1477139

URL: http://svn.apache.org/r1477139
Log:
TOBAGO-1171: Support for the Content Security Policy (CSP)
TOBAGO-1258: New attribute "omit" for commands

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=1477139&r1=1477138&r2=1477139&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Mon Apr 29 15:13:50 2013
@@ -148,7 +148,7 @@ public class DatePickerRenderer extends 
         elContext, "#{tobagoContext.resourceBundle.datePickerOk}", String.class));
     ComponentUtils.putDataAttributeWithPrefix(okButton, DataAttributes.DATEPICKEROK, true);
     okButton.getAttributes().put(Attributes.POPUP_CLOSE, "afterSubmit");
-    okButton.getAttributes().put(Attributes.ONCLICK, "/* fixme: avoid submit */");
+    okButton.setOmit(true);
     final UIButton cancelButton = (UIButton) CreateComponentUtils.createComponent(
         facesContext, UIButton.COMPONENT_TYPE, RendererTypes.BUTTON, "cancel");
     buttonPanel.getChildren().add(cancelButton);

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=1477139&r1=1477138&r2=1477139&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Mon Apr 29 15:13:50 2013
@@ -113,7 +113,7 @@ public abstract class ToolBarRendererBas
       } else if (command.getFacet(Facets.CHECKBOX) != null) {
         return renderSelectBoolean(facesContext, toolBar, command, writer, width);
       } else {
-        final CommandMap map = hasAnyCommand(command) ? new CommandMap(new Command(facesContext, command)) : null;
+        final CommandMap map = new CommandMap(new Command(facesContext, command));
         return renderToolbarButton(
             facesContext, toolBar, command, writer, false, width, map, null);
       }