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

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

Author: nbelaevski
Date: 2007-12-06 00:28:53 -0500 (Thu, 06 Dec 2007)
New Revision: 4534

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/templates/org/richfaces/htmlListShuttle.jspx
Log:
orderingList & listShuttle: selection initialization fixed

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-06 05:28:48 UTC (rev 4533)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js	2007-12-06 05:28:53 UTC (rev 4534)
@@ -2,6 +2,54 @@
 
 Richfaces.ListShuttle = Class.create();
 
+Richfaces.ListShuttle.Source = Class.create({
+	CLASSDEF: {
+       name: 'Richfaces.ListShuttle.Source',
+       parent: Richfaces.ListBase
+    }
+});
+
+Richfaces.ListShuttle.Source.prototype.CLASSES = {
+	ROW : {
+		ACTIVE   : "rich-shuttle-source-row-active",
+		SELECTED : "rich-shuttle-source-row-selected",
+		ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
+		DISABLED : "rich-shuttle-source-row-disabled",
+		NORMAL   : "rich-shuttle-source-row"
+	},
+	CELL : {
+		ACTIVE   : "rich-shuttle-source-cell-active",
+		SELECTED : "rich-shuttle-source-cell-selected",
+		ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
+		DISABLED : "rich-shuttle-source-cell-disabled",
+		NORMAL   : "rich-shuttle-source-cell"
+	}
+};
+
+Richfaces.ListShuttle.Target = Class.create({
+	CLASSDEF: {
+       name: 'Richfaces.ListShuttle.Target',
+       parent: Richfaces.OrderingList
+    }
+});
+
+Richfaces.ListShuttle.Target.prototype.CLASSES = {
+	ROW : {
+		ACTIVE   : "rich-shuttle-target-row-active",
+		SELECTED : "rich-shuttle-target-row-selected",
+		ACTIVE_SELECTED : "rich-shuttle-target-row-selected rich-shuttle-target-row-active",
+		DISABLED : "rich-shuttle-target-row-disabled",
+		NORMAL   : "rich-shuttle-target-row"
+	},
+	CELL : {
+		ACTIVE   : "rich-shuttle-target-cell-active",
+		SELECTED : "rich-shuttle-target-cell-selected",
+		ACTIVE_SELECTED : "rich-shuttle-target-cell-selected rich-shuttle-target-cell-active",
+		DISABLED : "rich-shuttle-target-cell-disabled",
+		NORMAL   : "rich-shuttle-target-cell"
+	}
+};
+
 Richfaces.ListShuttle.prototype = {
 	initialize: function(targetList, sourceList, clientId, controlIds, switchByClick) {
 		sourceList._onclickHandler = sourceList.onclickHandler;
@@ -22,40 +70,6 @@
 		
 		this.controlList = new Array();
 		this.initControlList(clientId, controlIds);
-		
-		this.sourceList.CLASSES = {
-			ROW : {
-				ACTIVE   : "rich-shuttle-source-row-active",
-				SELECTED : "rich-shuttle-source-row-selected",
-				ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
-				DISABLED : "rich-shuttle-source-row-disabled",
-				NORMAL   : "rich-shuttle-source-row"
-			},
-			CELL : {
-				ACTIVE   : "rich-shuttle-source-cell-active",
-				SELECTED : "rich-shuttle-source-cell-selected",
-				ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
-				DISABLED : "rich-shuttle-source-cell-disabled",
-				NORMAL   : "rich-shuttle-source-cell"
-			}
-		};
-		
-		this.targetList.CLASSES = {
-			ROW : {
-				ACTIVE   : "rich-shuttle-target-row-active",
-				SELECTED : "rich-shuttle-target-row-selected",
-				ACTIVE_SELECTED : "rich-shuttle-target-row-selected rich-shuttle-target-row-active",
-				DISABLED : "rich-shuttle-target-row-disabled",
-				NORMAL   : "rich-shuttle-target-row"
-			},
-			CELL : {
-				ACTIVE   : "rich-shuttle-target-cell-active",
-				SELECTED : "rich-shuttle-target-cell-selected",
-				ACTIVE_SELECTED : "rich-shuttle-target-cell-selected rich-shuttle-target-cell-active",
-				DISABLED : "rich-shuttle-target-cell-disabled",
-				NORMAL   : "rich-shuttle-target-cell"
-			}
-		};
 	},
 	
 	initControlList : function(clientId, ids) {
@@ -68,7 +82,7 @@
 				this.controlList[i] = new Control(node, disNode, false, false, id[0]);
 			}
 		}
-		this.controlListManager();
+		//this.controlListManager();
 	},
 	
 	controlListManager : function() {

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-06 05:28:48 UTC (rev 4533)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx	2007-12-06 05:28:53 UTC (rev 4534)
@@ -180,8 +180,8 @@
 							Event.onReady(function() {
 								var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']];
 								var listShuttleCotrolsIdPrefix = [['copy', 'discopy'], ['copyAll', 'discopyAll'], ['remove', 'disremove'], ['removeAll','disremoveAll']];
-								var listShuttle = new Richfaces.ListShuttle(new Richfaces.OrderingList('#{clientId}', '#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab', '#{clientId}tlFocusKeeper', cotrolsIdPrefix, '#{clientId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}), 
-																  			new Richfaces.ListBase('#{clientId}', '#{clientId}internal_tab', '#{clientId}internal_header_tab', '#{clientId}focusKeeper'), 
+								var listShuttle = new Richfaces.ListShuttle(new Richfaces.ListShuttle.Target('#{clientId}', '#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab', '#{clientId}tlFocusKeeper', cotrolsIdPrefix, '#{clientId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}), 
+																  			new Richfaces.ListShuttle.Source('#{clientId}', '#{clientId}internal_tab', '#{clientId}internal_header_tab', '#{clientId}focusKeeper'), 
 																  			"#{clientId}", listShuttleCotrolsIdPrefix, "#{switchByClick}");
 								var sourceLayoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab');
 								var targetLayoutManager = new LayoutManager('#{clientId}tlInternal_header_tab', '#{clientId}tlInternal_tab');