[richfaces-svn-commits] JBoss Rich Faces SVN: r19689 - in branches/RF-7817/ui/misc/ui: src/main/java/org/richfaces/renderkit and 1 other directories.

Author: nbelaevski Date: 2010-10-27 11:01:04 -0400 (Wed, 27 Oct 2010) New Revision: 19689 Modified: branches/RF-7817/ui/misc/ui/pom.xml branches/RF-7817/ui/misc/ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java branches/RF-7817/ui/misc/ui/src/main/templates/jquery.template.xml Log: Merged revisions 19156-19157,19159-19160,19176,19186-19187,19190,19194,19196,19199,19203-19204,19231-19234,19248-19249,19255-19256,19258-19262,19276,19279-19281,19283,19285,19291-19299,19307,19312,19315,19318-19319,19325,19341-19342,19345-19351,19353-19355,19358-19359,19364,19367-19369,19371,19374-19377,19379-19385,19387,19393-19394,19400,19402-19404,19418-19422,19426,19430-19431,19434-19441,19443-19444,19446,19468,19470,19477,19491,19498-19499,19501,19504,19506-19507,19517-19519,19525,19542-19543,19548,19550,19555,19557,19560-19561,19565-19566,19571-19573,19582-19585,19592-19593,19599,19601-19602,19613,19646,19657-19659,19665,19671-19674 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk Modified: branches/RF-7817/ui/misc/ui/pom.xml =================================================================== --- branches/RF-7817/ui/misc/ui/pom.xml 2010-10-27 14:59:44 UTC (rev 19688) +++ branches/RF-7817/ui/misc/ui/pom.xml 2010-10-27 15:01:04 UTC (rev 19689) @@ -40,6 +40,9 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> </plugin> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> </plugins> </build> Modified: branches/RF-7817/ui/misc/ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java =================================================================== --- branches/RF-7817/ui/misc/ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java 2010-10-27 14:59:44 UTC (rev 19688) +++ branches/RF-7817/ui/misc/ui/src/main/java/org/richfaces/renderkit/JQueryRendererBase.java 2010-10-27 15:01:04 UTC (rev 19689) @@ -22,21 +22,13 @@ package org.richfaces.renderkit; -import java.util.HashMap; -import java.util.Map; - import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.render.Renderer; -import org.ajax4jsf.javascript.ScriptUtils; -import org.richfaces.component.AbstractJQuery; -import org.richfaces.component.JQueryAttachType; -import org.richfaces.component.JQueryTiming; import org.richfaces.component.util.HtmlUtil; -import org.richfaces.renderkit.util.RendererUtils; /** * @author nick @@ -48,8 +40,6 @@ }) public abstract class JQueryRendererBase extends Renderer { - private RendererUtils rendererUtils = RendererUtils.getInstance(); - protected String getEscapedSelector(FacesContext context, UIComponent component) { String selector = (String) component.getAttributes().get("selector"); @@ -60,17 +50,4 @@ return selector; } - protected String getOptionsAsJavascriptString(FacesContext context, UIComponent component) { - AbstractJQuery jQuery = (AbstractJQuery) component; - - Map<String,Object> map = new HashMap<String, Object>(); - - rendererUtils.addToScriptHash(map, "selector", getEscapedSelector(context, jQuery)); - rendererUtils.addToScriptHash(map, "event", jQuery.getEvent()); - rendererUtils.addToScriptHash(map, "query", jQuery.getQuery()); - rendererUtils.addToScriptHash(map, "attachType", jQuery.getAttachType(), JQueryAttachType.DEFAULT.toString()); - rendererUtils.addToScriptHash(map, "timing", jQuery.getTiming(), JQueryTiming.DEFAULT.toString()); - - return ScriptUtils.toScript(map); - } } Modified: branches/RF-7817/ui/misc/ui/src/main/templates/jquery.template.xml =================================================================== --- branches/RF-7817/ui/misc/ui/src/main/templates/jquery.template.xml 2010-10-27 14:59:44 UTC (rev 19688) +++ branches/RF-7817/ui/misc/ui/src/main/templates/jquery.template.xml 2010-10-27 15:01:04 UTC (rev 19689) @@ -10,20 +10,28 @@ <cdk:component-family>org.richfaces.JQuery</cdk:component-family> <cdk:renderer-type>org.richfaces.JQueryRenderer</cdk:renderer-type> <cdk:renders-children>true</cdk:renders-children> + + <cdk:import package="org.richfaces.component" names="JQueryAttachType JQueryTiming" /> </cc:interface> <cc:implementation> <span id="#{clientId}" style="display: none;"> <script type="text/javascript"> <cdk:object name="functionName" value="#{component.attributes['name']}" /> - <cdk:object name="options" value="#{getOptionsAsJavascriptString(facesContext, component)}" /> + + <cdk:scriptObject name="options"> + <cdk:scriptOption name="selector" value="#{getEscapedSelector(facesContext, component)}" /> + <cdk:scriptOption attributes="event query" /> + <cdk:scriptOption name="attachType" value="#{component.attributes['attachType']}" defaultValue="JQueryAttachType.DEFAULT" /> + <cdk:scriptOption name="timing" value="#{component.attributes['timing']}" defaultValue="JQueryTiming.DEFAULT" /> + </cdk:scriptObject> <c:choose> <c:when test="#{not empty functionName}"> - #{functionName} = RichFaces.jQuery.createFunction(#{options}); + #{functionName} = RichFaces.jQuery.createFunction(#{toScriptArgs(options)}); </c:when> <c:otherwise> - RichFaces.jQuery.query(#{options}); + RichFaces.jQuery.query(#{toScriptArgs(options)}); </c:otherwise> </c:choose> </script>