JBoss Rich Faces SVN: r19347 - in trunk/ui/iteration/ui/src: main/resources/META-INF/resources/org.richfaces and 2 other directories.
1:56 p.m.
Author: konstantin.mishin
Date: 2010-09-27 14:56:19 -0400 (Mon, 27 Sep 2010)
New Revision: 19347
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js
trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml
trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java
Log:
RF-9294
Modified:
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
===================================================================
---
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-09-27
16:36:34 UTC (rev 19346)
+++
trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-09-27
18:56:19 UTC (rev 19347)
@@ -217,10 +217,10 @@
if (isCurrentPage) {
out.startElement(HtmlConstants.SPAN_ELEM, component);
- out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-dtl
rf-ds-cur " + styleClass, null);
+ out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-nmb-btn
rf-ds-act " + styleClass, null);
} else {
out.startElement(HtmlConstants.A_ELEMENT, component);
- out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-dtl "
+ styleClass, null);
+ out.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-ds-nmb-btn
" + styleClass, null);
out.writeAttribute(HtmlConstants.HREF_ATTR,
"javascript:void(0);", null);
}
Modified:
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss
===================================================================
---
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2010-09-27
16:36:34 UTC (rev 19346)
+++
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2010-09-27
18:56:19 UTC (rev 19347)
@@ -7,7 +7,7 @@
background:'#{richSkin.tableBackgroundColor}';
}
-a.rf-ds-dtl {
+a.rf-ds-nmb-btn {
color: '#{richSkin.generalTextColor}';
}
@@ -50,15 +50,15 @@
font-weight: normal;
}
-.rf-ds-l {
+.rf-ds-lft {
margin-right: 1px;
}
-.rf-ds-r {
+.rf-ds-rgh {
margin-left: 1px;
}
-.rf-ds-dtl {
+.rf-ds-nmb-btn {
cursor: pointer;
width: 2em;
text-align: center;
@@ -88,7 +88,7 @@
}
-.rf-ds-over {
+.rf-ds-hov {
border-width : 1px;
border-style: solid;
border-color: '#{richSkin.tableBorderColor}';
@@ -105,7 +105,7 @@
background: '#{richSkin.additionalBackgroundColor}';
}
-.rf-ds-cur {
+.rf-ds-act {
cursor: default;
font-weight: bold;
border-width: 1px;
Modified:
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js
===================================================================
---
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2010-09-27
16:36:34 UTC (rev 19346)
+++
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2010-09-27
18:56:19 UTC (rev 19347)
@@ -69,25 +69,25 @@
if(buttons) {
var leftButtons = buttons.left;
- css.mouseover = "rf-ds-btn rf-ds-l";
- css.mouseup = "rf-ds-btn rf-ds-l";
- css.mouseout = "rf-ds-btn rf-ds-l";
- css.mousedown = "rf-ds-btn rf-ds-l rf-ds-over";
+ css.mouseover = "rf-ds-btn rf-ds-lft";
+ css.mouseup = "rf-ds-btn rf-ds-lft";
+ css.mouseout = "rf-ds-btn rf-ds-lft";
+ css.mousedown = "rf-ds-btn rf-ds-lft rf-ds-hov";
initButtons(leftButtons,css, this);
var rightButtons = buttons.right;
- css.mouseover = "rf-ds-btn rf-ds-r";
- css.mouseup = "rf-ds-btn rf-ds-r";
- css.mouseout = "rf-ds-btn rf-ds-r";
- css.mousedown = "rf-ds-btn rf-ds-r rf-ds-over";
+ css.mouseover = "rf-ds-btn rf-ds-rgh";
+ css.mouseup = "rf-ds-btn rf-ds-rgh";
+ css.mouseout = "rf-ds-btn rf-ds-rgh";
+ css.mousedown = "rf-ds-btn rf-ds-rgh rf-ds-hov";
initButtons(rightButtons,css, this);
}
if(digitals) {
- css.mouseover= "rf-ds-dtl rf-ds-over";
- css.mouseup= "rf-ds-dtl rf-ds-over";
- css.mouseout = "rf-ds-dtl";
- css.mousedown="rf-ds-dtl rf-ds-press";
+ css.mouseover= "rf-ds-nmb-btn rf-ds-hov";
+ css.mouseup= "rf-ds-nmb-btn rf-ds-hov";
+ css.mouseout = "rf-ds-nmb-btn";
+ css.mousedown="rf-ds-nmb-btn rf-ds-press";
initButtons(digitals, css,this);
}
};
Modified: trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml
===================================================================
--- trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml 2010-09-27 16:36:34
UTC (rev 19346)
+++ trunk/ui/iteration/ui/src/main/templates/datascroller.template.xml 2010-09-27 18:56:19
UTC (rev 19347)
@@ -44,8 +44,8 @@
<c:if test="#{controlsState.firstRendered}">
<cdk:object type="boolean" name="isEnabled"
value="#{controlsState.firstEnabled}"/>
<cdk:object type="UIComponent" name="facet"
value="#{component.getFacet('first')}"/>
- <cdk:object type="String" name="enabledStyles"
value="rf-ds-btn rf-ds-l"/>
- <cdk:object type="String" name="disabledStyles"
value="rf-ds-btn rf-ds-l rf-ds-dis"/>
+ <cdk:object type="String" name="enabledStyles"
value="rf-ds-btn rf-ds-lft"/>
+ <cdk:object type="String" name="disabledStyles"
value="rf-ds-btn rf-ds-lft rf-ds-dis"/>
<cdk:object type="String" name="id"
value="#{clientId}_ds_f"/>
<cdk:object type="String" name="defaultText"
value="««««"/>
<xi:include xpointer="xpointer(/*)"
href="buttons.template.include" />
@@ -54,8 +54,8 @@
<c:if test="#{controlsState.fastRewindRendered}">
<cdk:object type="boolean" name="isEnabled"
value="#{controlsState.fastRewindEnabled}"/>
<cdk:object type="UIComponent" name="facet"
value="#{component.getFacet('fastRewind')}"/>
- <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-l"/>
- <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-l rf-ds-dis"/>
+ <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-lft"/>
+ <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-lft rf-ds-dis"/>
<cdk:object type="java.lang.String" name="id"
value="#{clientId}_ds_fr"/>
<cdk:object type="java.lang.String" name="defaultText"
value="««"/>
<xi:include xpointer="xpointer(/*)"
href="buttons.template.include" />
@@ -64,8 +64,8 @@
<c:if test="#{controlsState.previousRendered}">
<cdk:object name="isEnabled"
value="#{controlsState.previousEnabled}"/>
<cdk:object name="facet"
value="#{component.getFacet('previous')}"/>
- <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-l"/>
- <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-l rf-ds-dis"/>
+ <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-lft"/>
+ <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-lft rf-ds-dis"/>
<cdk:object name="id" value="#{clientId}_ds_prev"/>
<cdk:object name="defaultText" value="«"/>
<xi:include xpointer="xpointer(/*)"
href="buttons.template.include" />
@@ -76,8 +76,8 @@
<c:if test="#{controlsState.nextRendered}">
<cdk:object name="isEnabled"
value="#{controlsState.nextEnabled}"/>
<cdk:object name="facet"
value="#{component.getFacet('next')}"/>
- <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-r"/>
- <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-r rf-ds-dis"/>
+ <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-rgh"/>
+ <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-rgh rf-ds-dis"/>
<cdk:object name="id" value="#{clientId}_ds_next"/>
<cdk:object name="defaultText" value="»"/>
<xi:include xpointer="xpointer(/*)"
href="buttons.template.include" />
@@ -86,8 +86,8 @@
<c:if test="#{controlsState.fastForwardRendered}">
<cdk:object name="isEnabled"
value="#{controlsState.fastForwardEnabled}"/>
<cdk:object name="facet"
value="#{component.getFacet('fastForward')}"/>
- <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-r"/>
- <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-r rf-ds-dis"/>
+ <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-rgh"/>
+ <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-rgh rf-ds-dis"/>
<cdk:object name="id" value="#{clientId}_ds_ff"/>
<cdk:object name="defaultText"
value="»»"/>
<xi:include xpointer="xpointer(/*)"
href="buttons.template.include" />
@@ -96,8 +96,8 @@
<c:if test="#{controlsState.lastRendered}">
<cdk:object name="isEnabled"
value="#{controlsState.lastEnabled}"/>
<cdk:object name="facet"
value="#{component.getFacet('last')}"/>
- <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-r"/>
- <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-r rf-ds-dis"/>
+ <cdk:object type="java.lang.String" name="enabledStyles"
value="rf-ds-btn rf-ds-rgh"/>
+ <cdk:object type="java.lang.String" name="disabledStyles"
value="rf-ds-btn rf-ds-rgh rf-ds-dis"/>
<cdk:object name="id" value="#{clientId}_ds_l"/>
<cdk:object name="defaultText"
value="»»»»"/>
<xi:include xpointer="xpointer(/*)"
href="buttons.template.include" />
Modified:
trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java
===================================================================
---
trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java 2010-09-27
16:36:34 UTC (rev 19346)
+++
trunk/ui/iteration/ui/src/test/java/org/richfaces/renderkit/DataScrollerRenderTest.java 2010-09-27
18:56:19 UTC (rev 19347)
@@ -49,56 +49,56 @@
// first/fastRewind/previous buttons with arrows
HtmlElement first = getFirstButton(page, scrollerId);
assertEquals("span", first.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
HtmlElement fastRewind = getFastRewindButton(page, scrollerId);
assertEquals("span", fastRewind.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
HtmlElement previous = getPreviousButton(page, scrollerId);
assertEquals("span", previous.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// currently selected digital button
HtmlElement dc1 = getDigitalButton(page, scrollerId, 1);
assertEquals("span", dc1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
dc1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
dc1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// digital buttons
HtmlElement d2 = getDigitalButton(page, scrollerId, 2);
assertEquals("a", d2.getNodeName());
- assertEquals("rf-ds-dtl",
d2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn",
d2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
d2.getAttribute(HtmlConstants.HREF_ATTR));
HtmlElement d3 = getDigitalButton(page, scrollerId, 3);
assertEquals("a", d3.getNodeName());
- assertEquals("rf-ds-dtl",
d3.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn",
d3.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
d3.getAttribute(HtmlConstants.HREF_ATTR));
HtmlElement d4 = getDigitalButton(page, scrollerId, 4);
assertEquals("a", d4.getNodeName());
- assertEquals("rf-ds-dtl",
d4.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn",
d4.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
d4.getAttribute(HtmlConstants.HREF_ATTR));
HtmlElement d5 = getDigitalButton(page, scrollerId, 5);
assertEquals("a", d5.getNodeName());
- assertEquals("rf-ds-dtl",
d5.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn",
d5.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
d5.getAttribute(HtmlConstants.HREF_ATTR));
// next/fastForward/last buttons with arrows
HtmlElement next = getNextButton(page, scrollerId);
assertEquals("a", next.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
next.getAttribute(HtmlConstants.HREF_ATTR));
HtmlElement fastForward = getFastForwardButton(page, scrollerId);
assertEquals("a", fastForward.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
fastForward.getAttribute(HtmlConstants.HREF_ATTR));
HtmlElement last = getLastButton(page, scrollerId);
assertEquals("a", last.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("javascript:void(0);",
last.getAttribute(HtmlConstants.HREF_ATTR));
}
@@ -151,12 +151,12 @@
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -171,12 +171,12 @@
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -198,12 +198,12 @@
next.click();
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller outside dataTable has switched
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -218,12 +218,12 @@
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -247,12 +247,12 @@
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -267,12 +267,12 @@
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -294,12 +294,12 @@
ff.click();
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller outside dataTable has switched
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -314,12 +314,12 @@
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -342,12 +342,12 @@
currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -362,12 +362,12 @@
currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -390,12 +390,12 @@
currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller outside dataTable has switched
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -410,12 +410,12 @@
currentDigital2 = getDigitalButton(page, secondScrollerId, i);
assertEquals("span", currentDigital2.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital2.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// if scroller inside dataTable has switched
HtmlElement currentDigital1 = getDigitalButton(page, firstScrollerId, i);
assertEquals("span", currentDigital1.getNodeName());
- assertEquals("rf-ds-dtl rf-ds-cur",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-nmb-btn rf-ds-act",
currentDigital1.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
// check if page has switched
assertEquals(i + " page content", getCurrentPageContent(page, i));
@@ -437,26 +437,26 @@
//check right buttons
assertEquals("a", fastForward.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", last.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", next.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
fastForward = getFastForwardButton(page, secondScrollerId);
last = getFastForwardButton(page, secondScrollerId);
next = getNextButton(page, secondScrollerId);
assertEquals("a", fastForward.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", last.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", next.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
//check if left buttons is disabled
HtmlElement fastRewind = getFastRewindButton(page, firstScrollerId);
@@ -464,26 +464,26 @@
HtmlElement previous = getPreviousButton(page, firstScrollerId);
assertEquals("span", fastRewind.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", first.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", previous.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
fastRewind = getFastRewindButton(page, secondScrollerId);
first = getFirstButton(page, secondScrollerId);
next = getNextButton(page, secondScrollerId);
assertEquals("span", fastRewind.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", first.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", previous.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l rf-ds-dis",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft rf-ds-dis",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
}
private void checkLastPageButtons(HtmlPage page, String firstScrollerId, String
secondScrollerId) throws Exception {
@@ -493,13 +493,13 @@
HtmlElement next = getNextButton(page, firstScrollerId);
assertEquals("span", fastForward.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r rf-ds-dis",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", last.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r rf-ds-dis",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", next.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r rf-ds-dis",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
fastForward = getFastForwardButton(page, secondScrollerId);
@@ -507,13 +507,13 @@
next = getNextButton(page, secondScrollerId);
assertEquals("span", fastForward.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r rf-ds-dis",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis",
fastForward.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", last.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r rf-ds-dis",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis",
last.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("span", next.getNodeName());
- assertEquals("rf-ds-btn rf-ds-r rf-ds-dis",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-rgh rf-ds-dis",
next.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
//check if left buttons is enabled
HtmlElement fastRewind = getFastRewindButton(page, firstScrollerId);
@@ -521,26 +521,26 @@
HtmlElement previous = getPreviousButton(page, firstScrollerId);
assertEquals("a", fastRewind.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", first.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", previous.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
fastRewind = getFastRewindButton(page, secondScrollerId);
first = getFirstButton(page, secondScrollerId);
previous = getPreviousButton(page, secondScrollerId);
assertEquals("a", fastRewind.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft",
fastRewind.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", first.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft",
first.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
assertEquals("a", previous.getNodeName());
- assertEquals("rf-ds-btn rf-ds-l",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
+ assertEquals("rf-ds-btn rf-ds-lft",
previous.getAttribute(HtmlConstants.CLASS_ATTRIBUTE).trim());
}
private String getCurrentPageContent(HtmlPage page, int i) throws Exception {
5204
days inactive
5204
days old
richfaces-svn-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
richfaces-svn-commits＠lists.jboss.org