[richfaces-svn-commits] JBoss Rich Faces SVN: r12530 - in trunk: ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.
Author: pyaschenko
Date: 2009-02-02 13:36:15 -0500 (Mon, 02 Feb 2009)
New Revision: 12530
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
Log:
https://jira.jboss.org/jira/browse/RF-3589
https://jira.jboss.org/jira/browse/RF-1637
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
---
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2009-02-02
18:23:21 UTC (rev 12529)
+++
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2009-02-02
18:36:15 UTC (rev 12530)
@@ -181,6 +181,7 @@
isSafari: /Safari/.test(navigator.userAgent),
isOpera: !!window.opera,
isObjectEval: (Richfaces.eval!=undefined),
+ isFF2: (!window.opera && /Firefox\s*[\/]2[\.]/.test(navigator.userAgent)),
isFF3: (!window.opera && /Firefox\s*[\/]3[\.]/.test(navigator.userAgent))
};
Modified:
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
---
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2009-02-02
18:23:21 UTC (rev 12529)
+++
trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2009-02-02
18:36:15 UTC (rev 12530)
@@ -186,15 +186,9 @@
if (!(item instanceof Richfaces.SelectItem)) {
item = sourceComponent.getSelectItemByNode(item);
}
- if (!LayoutManager.isIE() && (targetComponent.shuttleTbody.rows.length == 0))
{
- var newItem = null;
- if (item instanceof Richfaces.ListShuttle.Target.SelectItem) {
- newItem = new this.targetList.controlClass(item._label, item._id,
item._node.cloneNode(true));
- } else {
- newItem = new this.sourceList.controlClass(item._label, item._id,
item._node.cloneNode(true));
- }
+ if (Richfaces.browser.isFF2 && (targetComponent.shuttleTbody.rows.length == 0))
{
this.tableUpdate(targetComponent);
- this.addItem(targetComponent, newItem);
+ this.addItem(targetComponent, item);
this.removeItem(sourceComponent, item);
sourceComponent.shuttleTable.deleteRow(item._node.rowIndex);