[richfaces-svn-commits] JBoss Rich Faces SVN: r4430 - in branches/3.1.x/ui/listShuttle/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

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

Author: vmolotkov
Date: 2007-12-03 12:09:06 -0500 (Mon, 03 Dec 2007)
New Revision: 4430

Modified:
   branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
   branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
   branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
Log:
attribute switchByClick was added

Modified: branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml	2007-12-03 17:05:24 UTC (rev 4429)
+++ branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml	2007-12-03 17:09:06 UTC (rev 4430)
@@ -65,6 +65,11 @@
 			<description>Collection which stores a set of selected items</description>
         </property>
 
+		<property>
+            <name>switchByClick</name>
+            <classname>boolean</classname>
+            <defaultvalue>false</defaultvalue>
+        </property>
         <property>
             <name>sourceListWidth</name>
             <classname>java.lang.String</classname>

Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js	2007-12-03 17:05:24 UTC (rev 4429)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js	2007-12-03 17:09:06 UTC (rev 4430)
@@ -3,7 +3,7 @@
 Richfaces.ListShuttle = Class.create();
 
 Richfaces.ListShuttle.prototype = {
-	initialize: function(targetList, sourceList, clientId, controlIds) {
+	initialize: function(targetList, sourceList, clientId, controlIds, switchByClick) {
 		sourceList._onclickHandler = sourceList.onclickHandler;
 		sourceList.onclickHandler = function(e) { this.onclickHandler(e, sourceList); }.bindAsEventListener(this);
 		targetList._onclickHandler = targetList.onclickHandler;
@@ -15,6 +15,11 @@
 		this.targetList.shuttleTable.observe("dblclick", function(e) {this.moveItemByClick(window.event||e, this.targetList, this.sourceList)}.bindAsEventListener(this));
 		this.sourceList.shuttleTable.observe("dblclick", function(e) {this.moveItemByClick(window.event||e, this.sourceList, this.targetList)}.bindAsEventListener(this));
 		
+		if (switchByClick == "true") {
+			this.targetList.shuttleTable.observe("click", function(e) {this.moveItemByClick(window.event||e, this.targetList, this.sourceList)}.bindAsEventListener(this));
+			this.sourceList.shuttleTable.observe("click", function(e) {this.moveItemByClick(window.event||e, this.sourceList, this.targetList)}.bindAsEventListener(this));
+		}
+		
 		this.controlList = new Array();
 		this.initControlList(clientId, controlIds);
 	},

Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx	2007-12-03 17:05:24 UTC (rev 4429)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx	2007-12-03 17:09:06 UTC (rev 4430)
@@ -41,8 +41,8 @@
 			    variables.setVariable(SELECTION_STATE_VAR_NAME, targetSelectionState);
 				String encodedTargetRows = encodeRows(context, component, false);
 				
-				//boolean switchByClick = (boolean) component.getAttributes().get("switchByClick");
-				//variables.setVariable("switchByClick", switchByClick);
+				Boolean switchByClick = (Boolean) component.getAttributes().get("switchByClick");
+				variables.setVariable("switchByClick", switchByClick);
 			]]>
 		</jsp:scriptlet>
 		<table id="#{clientId}" class="rich-list-shuttle">
@@ -184,7 +184,7 @@
 			var listShuttleCotrolsIdPrefix = [['copy', 'discopy'], ['copyAll', 'discopyAll'], ['remove', 'disremove'], ['removeAll','disremoveAll']];
 			var listShuttle = new Richfaces.ListShuttle(new Richfaces.OrderingList('#{cId}', '#{cId}tlInternal_tab', '#{cId}tlInternal_header_tab', '#{cId}tlFocusKeeper', '#{cId}tlValueKeeper', cotrolsIdPrefix, '#{cId}sortLabel', function() {#{component.attributes['onorderchanged']}}), 
 											  			new Richfaces.ListBase('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', '#{cId}valueKeeper'), 
-											  			"#{cId}", listShuttleCotrolsIdPrefix);
+											  			"#{cId}", listShuttleCotrolsIdPrefix, "#{switchByClick}");
 			var sourceLayoutManager = new LayoutManager('#{cId}internal_header_tab', '#{cId}internal_tab');
 			var targetLayoutManager = new LayoutManager('#{cId}tlInternal_header_tab', '#{cId}tlInternal_tab');
 			sourceLayoutManager.widthSynchronization();