[richfaces-svn-commits] JBoss Rich Faces SVN: r6484 - in trunk/ui: orderingList/src/main/java/org/richfaces/renderkit and 1 other directories.
Author: sergeyhalipov
Date: 2008-03-03 06:26:10 -0500 (Mon, 03 Mar 2008)
New Revision: 6484
Modified:
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
http://jira.jboss.com/jira/browse/RF-2338
Modified:
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
---
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2008-03-03
10:07:30 UTC (rev 6483)
+++
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2008-03-03
11:26:10 UTC (rev 6484)
@@ -105,11 +105,6 @@
color: inherit;
}
-.rich-list-shuttle-button-a-disabled {
- cursor: default;
- text-decoration: none;
-}
-
.rich-list-shuttle-caption {
text-align: left;
padding : 1px;
@@ -273,10 +268,6 @@
<u:style name="display" value="block" />
</u:selector>
- <u:selector name="a.rich-list-shuttle-button-a-disabled a">
- <u:style name="color" skin="tabDisabledTextColor"/>
- </u:selector>
-
<u:selector name=".rich-shuttle-source-caption,
.rich-shuttle-target-caption">
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
Modified:
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
---
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2008-03-03
10:07:30 UTC (rev 6483)
+++
trunk/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2008-03-03
11:26:10 UTC (rev 6484)
@@ -338,20 +338,12 @@
"this.className='" + baseStyle + "'", null);
writer.writeAttribute(HTML.onmouseout_ATTRIBUTE,
"this.className='" + baseStyle + "'", null);
- }
-
- writer.startElement(HTML.a_ELEMENT, orderingList);
- writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); //
FIXME:
- writer.writeAttribute(HTML.HREF_ATTR, "#", null);
- writer
- .writeAttribute(HTML.onclick_ATTRIBUTE, "return false;",
- null);
- if (!helper.enable) {
- writer.writeAttribute(HTML.DISABLED_ATTR, "disabled", null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle
- + "-a-disabled", null);
+
writer.startElement(HTML.a_ELEMENT, orderingList);
- } else {
+ writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); //
FIXME:
+ writer.writeAttribute(HTML.HREF_ATTR, "#", null);
+ writer.writeAttribute(HTML.onclick_ATTRIBUTE, "return false;", null);
+
writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle
+ "-selection", null);
writer.writeAttribute(HTML.onblur_ATTRIBUTE,
@@ -431,10 +423,9 @@
if (!useFacet) {
writer.endElement(HTML.DIV_ELEM);
- if (!helper.enable) {
+ if (helper.enable) {
writer.endElement(HTML.a_ELEMENT);
}
- writer.endElement(HTML.a_ELEMENT);
writer.endElement(HTML.DIV_ELEM);
}
writer.endElement(HTML.DIV_ELEM);
Modified:
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
---
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-03-03
10:07:30 UTC (rev 6483)
+++
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2008-03-03
11:26:10 UTC (rev 6484)
@@ -82,17 +82,10 @@
}
a.rich-ordering-list-button-selection:visited,
-a.rich-ordering-list-button-selection:link,
-a.rich-ordering-list-button-a-disabled:visited,
-a.rich-ordering-list-button-a-disabled:link {
+a.rich-ordering-list-button-selection:link {
color: inherit;
}
-.rich-ordering-list-button-a-disabled {
- cursor: default;
- text-decoration: none;
-}
-
.rich-ordering-list-caption {
text-align: left;
height: 8px;