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

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

Author: vmolotkov
Date: 2007-12-11 10:54:38 -0500 (Tue, 11 Dec 2007)
New Revision: 4717

Modified:
   branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
   branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
   branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
   branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
bug:RF-1593

Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js	2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js	2007-12-11 15:54:38 UTC (rev 4717)
@@ -86,9 +86,11 @@
 	var tgtElemPaddingWidth = LayoutManager.getPaddingWidth(tgtElem, "lr");
 	var tgtElemMarginWidth = LayoutManager.getMarginWidth(tgtElem, "lr");
 	var srcWidth = srcElem.offsetWidth - srcElemBorderWidth - srcElemPaddingWidth - srcElemMarginWidth;
-	return {srcWidth : srcWidth, colWidth : (srcWidth + (srcElemBorderWidth - tgtElemBorderWidth) 
-					 								  + (srcElemPaddingWidth - tgtElemPaddingWidth) 
-					 								  + (srcElemMarginWidth - tgtElemMarginWidth))};
+	var colWidth = srcWidth + (srcElemBorderWidth - tgtElemBorderWidth) 
+					 	    + (srcElemPaddingWidth - tgtElemPaddingWidth) 
+					 		+ (srcElemMarginWidth - tgtElemMarginWidth);
+	colWidth = (colWidth > 0) ? colWidth : 0; 
+	return {srcWidth : srcWidth, colWidth : colWidth};
 }
 
 LayoutManager.getBorderWidth = function(el, side) {

Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js	2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js	2007-12-11 15:54:38 UTC (rev 4717)
@@ -302,8 +302,10 @@
 		var rows = this.shuttleTbody.rows;
 		for (var i = startIndex; i <= endIndex; i++) {
 			rows[i].item.doSelect();
-			this.selectedItems.push(rows[i]);
-			//this.getSelectItemByNode(rows[i])._selected = true;
+			if (this.selectedItems.indexOf(rows[i]) == -1) {
+				this.selectedItems.push(rows[i]);
+				//this.getSelectItemByNode(rows[i])._selected = true;
+			}
 		}	
 		
 		this.saveState();

Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js	2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js	2007-12-11 15:54:38 UTC (rev 4717)
@@ -161,7 +161,7 @@
 						this.selectAll();
 						Event.stop(event);
 					  } 
-					  Richfaces.SelectItems.doActive(this.activeItem, this.CLASSES);
+					  this.activeItem.item.doActive();
 					  this.saveState();
 					  this.controlListManager();
 					  break; 

Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx	2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx	2007-12-11 15:54:38 UTC (rev 4717)
@@ -89,10 +89,14 @@
 	<script type="text/javascript">
 		var clientId = '#{cId}';
 		Event.onReady(function() {
+		 try {
 			var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']];
 			var shuttle = new Richfaces.OrderingList('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', cotrolsIdPrefix, '#{cId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}, Richfaces.OrderingListSelectItem);
 			var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab');
 			layoutManager.widthSynchronization();
+			} catch (e) {
+			alert(e);
+			}
 		});
 		//setTimeout(init, 0);
 	</script>