Author: abelevich Date: 2010-04-29 08:16:33 -0400 (Thu, 29 Apr 2010) New Revision: 16838 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/resources/META-INF/resources/css/datascroller.css root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/script/datascroller.js root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml Log: use <a> instead of <span> 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-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-04-29 12:16:33 UTC (rev 16838) @@ -204,7 +204,7 @@ styleClass=""; } - out.startElement(HTML.SPAN_ELEM, component); + out.startElement(HTML.A_ELEMENT, component); if (isCurrentPage) { out.writeAttribute(HTML.CLASS_ATTRIBUTE, "ds_digital ds_current " + styleClass, null); @@ -212,6 +212,9 @@ out.writeAttribute(HTML.CLASS_ATTRIBUTE, "ds_digital " + styleClass, null); } + out.writeAttribute(HTML.HREF_ATTR, "javascript:void(0);", null); + + if (null != style) { out.writeAttribute(HTML.STYLE_ATTRIBUTE, style, null); } @@ -224,7 +227,7 @@ digital.put(id, page); out.writeText(page, null); - out.endElement(HTML.SPAN_ELEM); + out.endElement(HTML.A_ELEMENT); } return digital; @@ -293,7 +296,6 @@ StringBuffer buffer = new StringBuffer(); function.appendScript(buffer); - definition.addToBody(buffer); return definition; } Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.css =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.css 2010-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/css/datascroller.css 2010-04-29 12:16:33 UTC (rev 16838) @@ -20,6 +20,8 @@ font-size : 11px/*generalSizeFont*/; font-family : verdana/*generalFamilyFont*/; color : #000000/*generalTextColor*/; + text-decoration:none; + font-weight: normal; } .ds_left{ @@ -42,8 +44,11 @@ background : url(images/bg_field.png) top left repeat-x/*gradient - from additionalBackgroundColor to tableBackgroundColor, background-color - tableBackgroundColor*/; display : inline-block; font-size : 11px/*generalSizeFont*/; - font-family : verdana/*generalFamilyFont*/; + font-family : verdana/*generalFamilyFont*/; + text-decoration:none; color : #000000/*generalTextColor*/; + font-weight: normal; + } .ds_over{ Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/script/datascroller.js =================================================================== --- root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/script/datascroller.js 2010-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/resources/META-INF/resources/script/datascroller.js 2010-04-29 12:16:33 UTC (rev 16838) @@ -2,16 +2,62 @@ richfaces.ui = richfaces.ui || {}; - richfaces.ui.DataScroller = function(id, submit, options) { + var initButtons = function(buttons, css, component) { + var id; + + var fn = function(e) { + e.data.fn.call(e.data.component, e); + } + + var data = {}; + data.component = component; + + for(id in buttons) { + var element = $(document.getElementById(id)); + + data.id = id; + data.page = buttons[id]; + data.element = element; + data.fn = component.processClick; + + element.bind('click', copy(data), fn); + + if(css) { + data.fn = component.processStyles; + data.css = css.mousedown; + element.bind('mousedown', copy(data), fn); + + data.css = css.mouseup; + element.bind('mouseup', copy(data), fn); + + data.css = css.mouseout; + element.bind('mouseout', copy(data), fn); + + data.css = css.mouseover; + element.bind('mouseover', copy(data), fn); + } + } + }; + + var copy = function(data) { + var key; + var eventData = {}; + + for (key in data) { + eventData[key] = data[key]; + } + + return eventData; + }; + + richfaces.ui.DataScroller = function(id, submit, options) { $super.constructor.call(this,id); - this.attachToDom.call(this, id); this.options = options; this.currentPage = options.currentPage; - - var buttons = options.buttons; + var buttons = options.buttons; var digitals = options.digitals; if (submit && typeof submit == 'function') { @@ -26,16 +72,14 @@ css.mouseup = "ds_button ds_left"; css.mouseout = "ds_button ds_left"; css.mousedown = "ds_button ds_left ds_over"; - - this.initButtons(leftButtons,css); + initButtons(leftButtons,css, this); var rightButtons = buttons.right; css.mouseover = "ds_button ds_right ds_over"; css.mouseup = "ds_button ds_right"; css.mouseout = "ds_button ds_right"; css.mousedown = "ds_button ds_right ds_over"; - - this.initButtons(rightButtons,css); + initButtons(rightButtons,css, this); } if(digitals) { @@ -43,95 +87,41 @@ css.mouseup= "ds_digital ds_over"; css.mouseout = "ds_digital"; css.mousedown="ds_digital ds_press"; - - this.initButtons(digitals,css); + initButtons(digitals, css,this); } }; var $super = richfaces.BaseComponent.extend(richfaces.BaseComponent, richfaces.ui.DataScroller); $.extend(richfaces.ui.DataScroller.prototype, (function (options) { - - var copy = function(data) { - var key; - var eventData = {}; - - for (key in data) { - eventData[key] = data[key]; - } - - return eventData; - }; - - var processStyles = function(event) { - var data = event.data; - - if(data && (data.page != this.currentPage)) { - var element = data.element; - var css = data.css; - - if(element && css) { - element.attr('class', css); - } - } - - }; - - var processClick = function(event) { - var data = event.data; - - if(data) { - var page = data.page; - if(page) { - this.switchToPage(page); - } - } - } - - var scrollEventName = "rich:datascroller:onscroll"; + + var scrollEventName = "rich:datascroller:onscroll"; return { name: "RichFaces.ui.DataScroller", + + processClick: function(event) { + var data = event.data; + if(data) { + var page = data.page; + if(page) { + this.switchToPage(page); + } + } + }, - initButtons: function(buttons, css) { + processStyles: function(event) { + var data = event.data; - var id; - - var fn = function(e) { - e.data.fn.call(e.data.component, e, this); + if(data && (data.page != this.currentPage)) { + var element = data.element; + var css = data.css; + + if(element && css) { + element.attr('class', css); + } } - - var data = {}; - data.component = this; - - for(id in buttons) { - - var element = $(document.getElementById(id)); - - data.id = id; - data.page = buttons[id]; - data.element = element; - data.fn = processClick; - - element.bind('click', copy(data), fn); - - if(css) { - data.fn = processStyles; - - data.css = css.mousedown; - element.bind('mousedown', copy(data), fn); - - data.css = css.mouseup; - element.bind('mouseup', copy(data), fn); - - data.css = css.mouseout; - element.bind('mouseout', copy(data), fn); - - data.css = css.mouseover; - element.bind('mouseover', copy(data), fn); - } - } }, switchToPage: function(page) { 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-04-29 03:42:51 UTC (rev 16837) +++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml 2010-04-29 12:16:33 UTC (rev 16838) @@ -20,14 +20,14 @@ <c:if test="#{controlsState.firstRendered}"> <c:choose> <c:when test="#{controlsState.firstEnabled}"> - <span id="#{clientId}_ds_f" class="ds_button ds_left" > + <a id="#{clientId}_ds_f" class="ds_button ds_left" href="javascript:void(0)" > &#171;&#171; - </span> + </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_f" class="ds_button ds_left ds_disabled"> + <a id="#{clientId}_ds_f" class="ds_button ds_left ds_disabled" href="javascript:void(0)"> &#171;&#171; - </span> + </a> </c:otherwise> </c:choose> </c:if> @@ -36,14 +36,14 @@ <c:if test="#{controlsState.fastRewindRendered}"> <c:choose> <c:when test="#{controlsState.fastRewindEnabled}"> - <span id="#{clientId}_ds_fr" class="ds_button ds_left"> + <a id="#{clientId}_ds_fr" class="ds_button ds_left" href="javascript:void(0)"> &#171; - </span> + </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_fr" class="ds_button ds_left ds_disabled"> + <a id="#{clientId}_ds_fr" class="ds_button ds_left ds_disabled" href="javascript:void(0)"> &#171; - </span> + </a> </c:otherwise> </c:choose> </c:if> @@ -53,14 +53,14 @@ <c:if test="#{controlsState.fastForwardRendered}"> <c:choose> <c:when test="#{controlsState.fastForwardEnabled}"> - <span id="#{clientId}_ds_ff" class="ds_button ds_right"> + <a id="#{clientId}_ds_ff" class="ds_button ds_right" href="javascript:void(0)"> &#187; - </span> + </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_ff" class="ds_button ds_right ds_disabled"> + <a id="#{clientId}_ds_ff" class="ds_button ds_right ds_disabled" href="javascript:void(0)"> &#187; - </span> + </a> </c:otherwise> </c:choose> </c:if> @@ -68,14 +68,14 @@ <c:if test="#{controlsState.lastRendered}"> <c:choose> <c:when test="#{controlsState.lastEnabled}"> - <span id="#{clientId}_ds_l" class="ds_button ds_right"> + <a id="#{clientId}_ds_l" class="ds_button ds_right" href="javascript:void(0)"> &#187;&#187; - </span> + </a> </c:when> <c:otherwise> - <span id="#{clientId}_ds_l" class="ds_button ds_right ds_disabled"> + <a id="#{clientId}_ds_l" class="ds_button ds_right ds_disabled" href="javascript:void(0)"> &#187;&#187; - </span> + </a> </c:otherwise> </c:choose> </c:if>