4:02 p.m.
Author: vmolotkov
Date: 2008-07-08 10:02:15 -0400 (Tue, 08 Jul 2008)
New Revision: 9450
Modified:
trunk/ui/pickList/src/main/config/component/picklist.xml
trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js
trunk/ui/pickList/src/main/templates/htmlPickList.jspx
Log:
RF-3190
Modified: trunk/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/ui/pickList/src/main/config/component/picklist.xml 2008-07-08 12:27:22 UTC (rev
9449)
+++ trunk/ui/pickList/src/main/config/component/picklist.xml 2008-07-08 14:02:15 UTC (rev
9450)
@@ -217,15 +217,15 @@
<classname>int</classname>
</property>
- <property hidden="true" >
+ <property hidden="true">
<name>onchange</name>
<classname>java.lang.String</classname>
</property>
- <property hidden="true" >
+ <property>
<name>onfocus</name>
<classname>java.lang.String</classname>
</property>
- <property hidden="true" >
+ <property>
<name>onblur</name>
<classname>java.lang.String</classname>
</property>
Modified:
trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js
===================================================================
---
trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js 2008-07-08
12:27:22 UTC (rev 9449)
+++
trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js 2008-07-08
14:02:15 UTC (rev 9450)
@@ -1,8 +1,8 @@
if(!window.Richfaces) window.Richfaces = {};
Richfaces.PickList = Class.create(Richfaces.ListShuttle, {
- initialize : function($super, targetList, sourceList, clientId, controlIds,
switchByClick, onlistchanged, valueKeeperId) {
- $super(targetList, sourceList, clientId, controlIds, switchByClick, onlistchanged);
+ initialize : function($super, targetList, sourceList, clientId, controlIds,
switchByClick, events, valueKeeperId) {
+ $super(targetList, sourceList, clientId, controlIds, switchByClick, events);
this.valueKeeper = $(valueKeeperId);
//this.controlListManager();
},
Modified: trunk/ui/pickList/src/main/templates/htmlPickList.jspx
===================================================================
--- trunk/ui/pickList/src/main/templates/htmlPickList.jspx 2008-07-08 12:27:22 UTC (rev
9449)
+++ trunk/ui/pickList/src/main/templates/htmlPickList.jspx 2008-07-08 14:02:15 UTC (rev
9450)
@@ -105,7 +105,7 @@
</td>
<td>
- <div class="rich-picklist-target-items #{component.listClass}" >
+ <div class="rich-picklist-target-items #{component.listClass}">
<input type="hidden" value=":" style="display:
none;" name="#{baseClientId}" />
<f:call name="encodeHiddenField" />
<input id="#{clientId}tlFocusKeeper" type="button"
value="" style="width: 1px; position: absolute; left: -32767px;"/>
@@ -151,6 +151,7 @@
</vcp:body>
</tbody>
</table>
+
<f:clientId var="clientId"/>
<span id="#{clientId}script">
@@ -165,7 +166,9 @@
new Richfaces.PickList.Target('#{clientId}',
'#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab',
'#{clientId}tlFocusKeeper', undefined, Richfaces.PickList.Target.SelectItem,
#{this:getColumnClassesAsJSArray(context, component)},
#{this:getRowClassesAsJSArray(context, component)}),
new Richfaces.PickList.Source('#{clientId}',
'#{clientId}internal_tab', '#{clientId}internal_header_tab',
'#{clientId}focusKeeper', undefined, Richfaces.PickList.Source.SelectItem,
#{this:getColumnClassesAsJSArray(context, component)},
#{this:getRowClassesAsJSArray(context, component)}),
"#{clientId}", [['copy', 'discopy'], ['copyAll',
'discopyAll'], ['remove', 'disremove'],
['removeAll','disremoveAll']],
- "#{switchByClick}", {onlistchanged: #{this:getAsEventHandler(context,
component, "onlistchanged")}},
+ "#{switchByClick}", {onlistchanged: #{this:getAsEventHandler(context,
component, "onlistchanged")},
+ onfocus:#{this:getAsEventHandler(context, component, "onfocus")},
+ onblur:#{this:getAsEventHandler(context, component, "onblur")}},
"#{clientId}valueKeeper");
},
RichShuttleUtils.Condition.ElementPresent("#{clientId}"), 100