[richfaces-svn-commits] JBoss Rich Faces SVN: r4849 - in branches/3.1.x/ui: orderingList/src/main/java/org/richfaces/renderkit and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: sergeyhalipov
Date: 2007-12-14 08:45:08 -0500 (Fri, 14 Dec 2007)
New Revision: 4849

Modified:
   branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
   branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-1643

Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss	2007-12-14 13:35:42 UTC (rev 4848)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss	2007-12-14 13:45:08 UTC (rev 4849)
@@ -101,17 +101,10 @@
 }
 
 a.rich-list-shuttle-button-selection:visited,
-a.rich-list-shuttle-button-selection:link,
-a.rich-list-shuttle-button-a-disabled:visited,
-a.rich-list-shuttle-button-a-disabled:link {
+a.rich-list-shuttle-button-selection:link {
 	color: inherit;
 }
 
-.rich-list-shuttle-button-a-disabled {
-	cursor: default;
-	text-decoration: none;
-}
-
 .rich-list-shuttle-caption {
 	text-align: left;
 	padding : 1px;

Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java	2007-12-14 13:35:42 UTC (rev 4848)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java	2007-12-14 13:45:08 UTC (rev 4849)
@@ -317,18 +317,15 @@
 				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);
-			if (!helper.enable) {
-				writer.writeAttribute(HTML.DISABLED_ATTR, "disabled", null);
-				writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-a-disabled", null);
-			} else {
+			if (helper.enable) {
+				writer.startElement(HTML.a_ELEMENT, orderingList);
+				writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); //FIXME:
+				writer.writeAttribute(HTML.HREF_ATTR, "#", null);
 				writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-selection", null);
 				writer.writeAttribute(HTML.onblur_ATTRIBUTE, "Control.onblur(this);", null);
 				writer.writeAttribute(HTML.onfocus_ATTRIBUTE, "Control.onfocus(this);", null);
+				writer.writeAttribute(HTML.onclick_ATTRIBUTE, "return false;", null);
 			}
-			writer.writeAttribute(HTML.onclick_ATTRIBUTE, "return false;", null);
 			
 			writer.startElement(HTML.DIV_ELEM, orderingList);
 			writer.writeAttribute(HTML.class_ATTRIBUTE, baseStyle + "-content", null);
@@ -378,7 +375,9 @@
 		
 		if (!useFacet) {
 			writer.endElement(HTML.DIV_ELEM);
-			writer.endElement(HTML.a_ELEMENT);
+			if (helper.enable) {
+				writer.endElement(HTML.a_ELEMENT);
+			}
 			writer.endElement(HTML.DIV_ELEM);
 		}
 		writer.endElement(HTML.DIV_ELEM);