[richfaces-svn-commits] JBoss Rich Faces SVN: r4865 - in branches/3.1.x/ui: listShuttle/src/test/java/org/richfaces/renderkit and 2 other directories.

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

Author: sergeyhalipov
Date: 2007-12-14 13:18:17 -0500 (Fri, 14 Dec 2007)
New Revision: 4865

Modified:
   branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
   branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
   branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java
   branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.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 18:04:49 UTC (rev 4864)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss	2007-12-14 18:18:17 UTC (rev 4865)
@@ -105,6 +105,11 @@
 	color: inherit;
 }
 
+.rich-list-shuttle-button-a-disabled {
+	cursor: default;
+	text-decoration: none;
+}
+
 .rich-list-shuttle-caption {
 	text-align: left;
 	padding : 1px;
@@ -154,7 +159,7 @@
 
 ]]>
 </f:verbatim>
-
+
 	<u:selector name=".rich-list-shuttle">
 		<!--u:style name="background-color" skin="additionalBackgroundColor" />
 		<u:style name="border-color" skin="tableBorderColor" />
@@ -178,7 +183,7 @@
 		<u:style name="border-right-color" skin="tableBorderColor" />
 		<u:style name="border-bottom-color" skin="tableBorderColor" />
 	</u:selector>
-	
+	
 	<u:selector name=".rich-shuttle-header-tab-cell-last">
 		<u:style name="border-right-width" value="0px" />
 	</u:selector>
@@ -268,6 +273,10 @@
 		<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: branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java	2007-12-14 18:04:49 UTC (rev 4864)
+++ branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java	2007-12-14 18:18:17 UTC (rev 4865)
@@ -298,6 +298,10 @@
         	
         	element = (HtmlElement) element.getParentNode();
         	assertNotNull(element);
+        	if ("a".equalsIgnoreCase(element.getNodeName())) {
+        		element = (HtmlElement) element.getParentNode();
+        		assertNotNull(element);
+        	}
         	assertEquals("div", element.getNodeName());
         	
         	element = (HtmlElement) element.getParentNode();

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 18:04:49 UTC (rev 4864)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java	2007-12-14 18:18:17 UTC (rev 4865)
@@ -317,14 +317,18 @@
 				writer.writeAttribute(HTML.onmouseout_ATTRIBUTE, "this.className='" + baseStyle + "'", null);
 			}
 			
-			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.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);
-				writer.writeAttribute(HTML.id_ATTRIBUTE, controlId + "link", null); //FIXME:
-				writer.writeAttribute(HTML.HREF_ATTR, "#", null);
+			} else {
 				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.startElement(HTML.DIV_ELEM, orderingList);
@@ -375,9 +379,10 @@
 		
 		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: branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java	2007-12-14 18:04:49 UTC (rev 4864)
+++ branches/3.1.x/ui/orderingList/src/test/java/org/richfaces/renderkit/OrderingListRenderingTest.java	2007-12-14 18:18:17 UTC (rev 4865)
@@ -270,10 +270,13 @@
         	assertEquals("a", element.getNodeName());
         	String href = element.getAttributeValue("href");
         	assertNotNull(href);
-        	assertTrue("#".equals(href));
         	
         	element = (HtmlElement) element.getParentNode();
         	assertNotNull(element);
+        	if ("a".equalsIgnoreCase(element.getNodeName())) {
+        		element = (HtmlElement) element.getParentNode();
+        		assertNotNull(element);
+        	}
         	assertEquals("div", element.getNodeName());
         	clazz = element.getAttributeValue("class");
         	assertNotNull(clazz);