Author: abelevich Date: 2010-03-09 11:53:15 -0500 (Tue, 09 Mar 2010) New Revision: 16543 Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml Log: add onclick script encoding Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-03-09 15:17:13 UTC (rev 16542) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-03-09 16:53:15 UTC (rev 16543) @@ -335,7 +335,7 @@ return 1; } } - + private void updateModel(int newPage) { UIComponent dataTable = getDataTable(); Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-03-09 15:17:13 UTC (rev 16542) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-03-09 16:53:15 UTC (rev 16543) @@ -215,7 +215,7 @@ out.writeAttribute(HTML.ONMOUSEUP_ATTRIBUTE, "this.className='ds_digital ds_over'", null); out.writeAttribute(HTML.ONMOUSEDOWN_ATTRIBUTE, "this.className='ds_digital ds_press'", null); - out.writeAttribute(HTML.ONCLICK_ATTRIBUTE, getOnClick(Integer.toString(i + 1)), null); + out.writeAttribute(HTML.ONCLICK_ATTRIBUTE, getOnClick(context, component, Integer.toString(i + 1)), null); } if (null != style) { @@ -228,8 +228,9 @@ - public Object getOnClick(String string) { - return "Event.fire(this, 'rich:datascroller:onscroll', {'page': '" + string + "'});"; + public Object getOnClick(FacesContext facesContext, UIComponent component, String string) { + String id = component.getClientId(facesContext); + return "RichFaces.Event.callHandlerById('" + id + "', 'rich:datascroller:onscroll', {'page': '" + string + "'});"; } public void renderPages(FacesContext context, UIComponent component, int pageIndex, int count) throws IOException { Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml 2010-03-09 15:17:13 UTC (rev 16542) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml 2010-03-09 16:53:15 UTC (rev 16543) @@ -20,7 +20,7 @@ <c:if test="#{controlsState.firstRendered}"> <c:choose> <c:when test="#{controlsState.firstEnabled}"> - <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick('first')}"> + <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick(facesContext, component, 'first')}"> &#171;&#171; </span> </c:when> @@ -36,7 +36,7 @@ <c:if test="#{controlsState.fastRewindRendered}"> <c:choose> <c:when test="#{controlsState.fastRewindEnabled}"> - <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick('fastRewind')}"> + <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick(facesContext, component, 'fastRewind')}"> &#171; </span> </c:when> @@ -53,7 +53,7 @@ <c:if test="#{controlsState.fastForwardRendered}"> <c:choose> <c:when test="#{controlsState.fastForwardEnabled}"> - <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick('fastForward')}"> + <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick(facesContext, component, 'fastForward')}"> &#187; </span> </c:when> @@ -68,7 +68,7 @@ <c:if test="#{controlsState.lastRendered}"> <c:choose> <c:when test="#{controlsState.lastEnabled}"> - <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick('last')}"> + <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick(facesContext, component, 'last')}"> &#187;&#187; </span> </c:when>