Author: mcucchiara
Date: Tue Jan 18 21:47:21 2011
New Revision: 1060591
URL: http://svn.apache.org/viewvc?rev=1060591&view=rev
Log:
WW-3560 - DoubleSelect doesn't work in all browsers (BlackBerry Browser)
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java?rev=1060591&r1=1060590&r2=1060591&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java
Tue Jan 18 21:47:21 2011
@@ -61,7 +61,7 @@ public class DoubleSelect extends Double
public void evaluateExtraParams() {
super.evaluateExtraParams();
StringBuilder onchangeParam = new StringBuilder();
-
onchangeParam.append(getParameters().get("id")).append("Redirect(this.options.selectedIndex)");
+
onchangeParam.append(getParameters().get("id")).append("Redirect(this.selectedIndex)");
if(StringUtils.isNotEmpty(this.onchange)) {
onchangeParam.append(";").append(this.onchange);
}
Modified:
struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm?rev=1060591&r1=1060590&r2=1060591&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm
Tue Jan 18 21:47:21 2011
@@ -96,7 +96,7 @@ var $!struts.htmlEncode($parameters.name
$!{struts.htmlEncode($parameters.name)}Redirect($redirectTo);
function $!{struts.htmlEncode($parameters.name)}Redirect(x) {
for (m = $!{struts.htmlEncode($parameters.name)}Temp.options.length - 1; m
>= 0; m--)
- $!{struts.htmlEncode($parameters.name)}Temp.options[m] = null;
+ $!{struts.htmlEncode($parameters.name)}Temp.remove(m);
for (i = 0; i < $!{parameters.name}Group[x].length; i++) {
$!{struts.htmlEncode($parameters.name)}Temp.options[i] = new
Option($!{struts.htmlEncode($parameters.name)}Group[x][i].text,
$!{struts.htmlEncode($parameters.name)}Group[x][i].value);
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?rev=1060591&r1=1060590&r2=1060591&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl
Tue Jan 18 21:47:21 2011
@@ -126,7 +126,7 @@
function ${parameters.id}Redirect(x) {
var selected = false;
for (m = ${parameters.id}Temp.options.length - 1; m >= 0; m--) {
- ${parameters.id}Temp.options[m] = null;
+ ${parameters.id}Temp.remove(m);
}
for (i = 0; i < ${parameters.id}Group[x].length; i++) {
