You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/12/09 13:35:23 UTC
svn commit: r602667 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
Author: bommel
Date: Sun Dec 9 04:35:22 2007
New Revision: 602667
URL: http://svn.apache.org/viewvc?rev=602667&view=rev
Log:
(TOBAGO-553) Support for click and dblClick action in the sheet
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.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?rev=602667&r1=602666&r2=602667&view=diff
==============================================================================
--- 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 Sun Dec 9 04:35:22 2007
@@ -34,6 +34,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_OUT;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.SupportsMarkup;
+import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIData;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
@@ -667,6 +668,25 @@
return "\"" + str + "\"";
}
return null;
+ }
+
+ public static String getRenderedPartiallyJavascriptArray(FacesContext facesContext, UICommand command) {
+ if (command == null) {
+ return null;
+ }
+ String[] list = command.getRenderedPartially();
+ StringBuilder strBuilder = new StringBuilder();
+ strBuilder.append("[");
+ for (int i = 0; i < list.length; i++) {
+ if (i != 0) {
+ strBuilder.append(",");
+ }
+ strBuilder.append("\"");
+ strBuilder.append(HtmlRendererUtil.getComponentId(facesContext, command, list[i]));
+ strBuilder.append("\"");
+ }
+ strBuilder.append("]");
+ return strBuilder.toString();
}
public static String getJavascriptArray(String[] list) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=602667&r1=602666&r2=602667&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Sun Dec 9 04:35:22 2007
@@ -174,9 +174,9 @@
"new Tobago.Sheet(\"" + sheetId + "\", " + ajaxEnabled
+ ", \"" + checked + "\", \"" + unchecked + "\", \"" + data.getSelectable() + "\", "+ frequency
+ ", " + (clickAction!=null?HtmlRendererUtil.getJavascriptString(clickAction.getId()):null)
- + ", " + (clickAction!=null?HtmlRendererUtil.getJavascriptArray(clickAction.getRenderedPartially()):null)
- + ", " + (dblClickAction!=null?HtmlRendererUtil.getJavascriptString(dblClickAction.getId()):null) + ", "
- + (dblClickAction!=null?HtmlRendererUtil.getJavascriptArray(dblClickAction.getRenderedPartially()):null)
+ + ", " + HtmlRendererUtil.getRenderedPartiallyJavascriptArray(facesContext, clickAction)
+ + ", " + (dblClickAction!=null?HtmlRendererUtil.getJavascriptString(dblClickAction.getId()):null)
+ + ", " + HtmlRendererUtil.getRenderedPartiallyJavascriptArray(facesContext, dblClickAction)
+ ");"
};
UIPage page = ComponentUtil.findPage(facesContext, data);